Merge pull request #114 from gocardless/lawrence-remove-the-other-pla…

…ce-we-log-access-tokens Remove another place we log access tokens
gocardless · Aug 13, 2020 · f9f12db · f9f12db
2 parents a0c286b + 8ec4060
commit f9f12db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pkg/server/api/middleware/error_handler.go b/pkg/server/api/middleware/error_handler.go
@@ -12,10 +12,7 @@ import (
 func NewErrorHandler(logger log.Logger) chain.TerminatingMiddleware {
 	return func(next chain.Handler) http.HandlerFunc {
 		return func(w http.ResponseWriter, r *http.Request) {
-			err := next(w, r)
-			if err != nil {
-				logger.With("http_request", r).Error(err.Error())
-			}
+			next(w, r)
 		}
 	}
 }

diff --git a/pkg/server/api/middleware/logger.go b/pkg/server/api/middleware/logger.go
@@ -62,6 +62,10 @@ func NewRequestLogger(logger log.Logger) chain.Middleware {
 				duration.Seconds(),
 			)
 
+			if err != nil {
+				scopedLogger = scopedLogger.With("error", err.Error())
+			}
+
 			scopedLogger.
 				With("status", recorder.Code).
 				With("duration", duration.Seconds()).