fixup! provisioning/LinkNew: use structured logging

Signed-off-by: Sumner Evans <[email protected]>

provisioning.go

@@ -352,13 +352,15 @@ func (prov *ProvisioningAPI) clearSession(user *User) {
 
 // ** Provisioning API Helpers ** //
 
-func (prov *ProvisioningAPI) loginOrSendError(w http.ResponseWriter, user *User) (*provisioningHandle, error) {
+func (prov *ProvisioningAPI) loginOrSendError(ctx context.Context, w http.ResponseWriter, user *User) (*provisioningHandle, error) {
  newSessionLoggedIn, handle, err := prov.newOrExistingSession(user)
  if err != nil {
  return nil, err
  }
  if !newSessionLoggedIn {
- prov.log.Debug().Msgf("LinkNew from %v, user already has a pending provisioning request (%d), cancelling", user.MXID, handle.id)
+ zerolog.Ctx(ctx).Debug().
+ Int("existing_provisioning_handle", handle.id).
+ Msg("user already has pending provisioning request, cancelling")
  prov.clearSession(user)
  newSessionLoggedIn, handle, err = prov.newOrExistingSession(user)
  if err != nil {
@@ -400,9 +402,10 @@ func (prov *ProvisioningAPI) LinkNew(w http.ResponseWriter, r *http.Request) {
  Str("action", "link_new").
  Str("user_id", user.MXID.String()).
  Logger()
+ ctx := log.WithContext(r.Context())
  log.Debug().Msg("starting login")
 
- handle, err := prov.loginOrSendError(w, user)
+ handle, err := prov.loginOrSendError(ctx, w, user)
  if err != nil {
  jsonResponse(w, http.StatusInternalServerError, Error{
  Success: false,