summaryrefslogtreecommitdiff
path: root/vendor/github.com/smallstep/certificates/api/log/log.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/smallstep/certificates/api/log/log.go')
-rw-r--r--vendor/github.com/smallstep/certificates/api/log/log.go34
1 files changed, 4 insertions, 30 deletions
diff --git a/vendor/github.com/smallstep/certificates/api/log/log.go b/vendor/github.com/smallstep/certificates/api/log/log.go
index 6cc61a7..687d61c 100644
--- a/vendor/github.com/smallstep/certificates/api/log/log.go
+++ b/vendor/github.com/smallstep/certificates/api/log/log.go
@@ -2,7 +2,6 @@
package log
import (
- "context"
"fmt"
"net/http"
"os"
@@ -10,29 +9,6 @@ import (
"github.com/pkg/errors"
)
-type errorLoggerKey struct{}
-
-// ErrorLogger is the function type used to log errors.
-type ErrorLogger func(http.ResponseWriter, *http.Request, error)
-
-func (fn ErrorLogger) call(w http.ResponseWriter, r *http.Request, err error) {
- if fn == nil {
- return
- }
- fn(w, r, err)
-}
-
-// WithErrorLogger returns a new context with the given error logger.
-func WithErrorLogger(ctx context.Context, fn ErrorLogger) context.Context {
- return context.WithValue(ctx, errorLoggerKey{}, fn)
-}
-
-// ErrorLoggerFromContext returns an error logger from the context.
-func ErrorLoggerFromContext(ctx context.Context) (fn ErrorLogger) {
- fn, _ = ctx.Value(errorLoggerKey{}).(ErrorLogger)
- return
-}
-
// StackTracedError is the set of errors implementing the StackTrace function.
//
// Errors implementing this interface have their stack traces logged when passed
@@ -51,10 +27,8 @@ type fieldCarrier interface {
// Error adds to the response writer the given error if it implements
// logging.ResponseLogger. If it does not implement it, then writes the error
// using the log package.
-func Error(w http.ResponseWriter, r *http.Request, err error) {
- ErrorLoggerFromContext(r.Context()).call(w, r, err)
-
- fc, ok := w.(fieldCarrier)
+func Error(rw http.ResponseWriter, err error) {
+ fc, ok := rw.(fieldCarrier)
if !ok {
return
}
@@ -77,7 +51,7 @@ func Error(w http.ResponseWriter, r *http.Request, err error) {
// EnabledResponse log the response object if it implements the EnableLogger
// interface.
-func EnabledResponse(rw http.ResponseWriter, r *http.Request, v any) {
+func EnabledResponse(rw http.ResponseWriter, v any) {
type enableLogger interface {
ToLog() (any, error)
}
@@ -85,7 +59,7 @@ func EnabledResponse(rw http.ResponseWriter, r *http.Request, v any) {
if el, ok := v.(enableLogger); ok {
out, err := el.ToLog()
if err != nil {
- Error(rw, r, err)
+ Error(rw, err)
return
}