Support the log/slog ErrorContext function

janos · Aug 2, 2023 · bb53e43 · bb53e43
1 parent 448e6e9
commit bb53e43
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: '1.21.0-rc.2'
+        go-version: '1.21.0-rc.3'
 
     - name: Checkout
       uses: actions/checkout@v1

diff --git a/recovery/recovery.go b/recovery/recovery.go
@@ -87,13 +87,13 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			if h.label != "" {
 				debugMsg = h.label + "\n\n" + debugMsg
 			}
-			h.logger.ErrorCtx(ctx, "http recovery handler", "method", r.Method, "url", r.URL.String(), "error", err, "debug", debugMsg)
+			h.logger.ErrorContext(ctx, "http recovery handler", "method", r.Method, "url", r.URL.String(), "error", err, "debug", debugMsg)
 
 			if h.notifier != nil {
 				go func() {
 					defer func() {
 						if err := recover(); err != nil {
-							h.logger.ErrorCtx(ctx, "http recovery handler: notify panic", slog.Any("error", err))
+							h.logger.ErrorContext(ctx, "http recovery handler: notify panic", slog.Any("error", err))
 						}
 					}()
 
@@ -107,7 +107,7 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 						),
 						debugMsg,
 					); err != nil {
-						h.logger.ErrorCtx(ctx, "http recovery handler: notify", slog.Any("error", err))
+						h.logger.ErrorContext(ctx, "http recovery handler: notify", slog.Any("error", err))
 					}
 				}()
 			}

diff --git a/servers/servers.go b/servers/servers.go
@@ -239,7 +239,7 @@ func (s *Servers) Shutdown(ctx context.Context) {
 
 			s.logger.Info("shutting down server", "name", srv.label())
 			if err := srv.Shutdown(ctx); err != nil {
-				s.logger.ErrorCtx(ctx, "shutting down server", "name", srv.label(), "error", err)
+				s.logger.ErrorContext(ctx, "shutting down server", "name", srv.label(), "error", err)
 			}
 		}(srv)
 	}