Skip to content

Commit

Permalink
fix: logging
Browse files Browse the repository at this point in the history
  • Loading branch information
ConsoleTVs committed Jul 11, 2024
1 parent d51f7b9 commit 0b2a8ac
Showing 1 changed file with 45 additions and 37 deletions.
82 changes: 45 additions & 37 deletions builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,17 @@ func DefaultResponderHandler(writer http.ResponseWriter, request *http.Request,

if builder.writer != nil {
if writeHeaders(writer, builder) {
logger := request.Context().Value(LoggerKey{}).(*slog.Logger)

logger.Error(
"detected server error",
"code", builder.status,
"text", http.StatusText(builder.status),
"url", request.URL.String(),
"kind", "writer",
)
logger, ok := request.Context().Value(LoggerKey{}).(*slog.Logger)

if ok && logger != nil {
logger.Error(
"detected server error",
"code", builder.status,
"text", http.StatusText(builder.status),
"url", request.URL.String(),
"kind", "writer",
)
}
}

builder.writer(writer)
Expand All @@ -69,16 +71,18 @@ func DefaultResponderHandler(writer http.ResponseWriter, request *http.Request,
}

if writeHeaders(writer, builder) {
logger := request.Context().Value(LoggerKey{}).(*slog.Logger)

logger.Error(
"detected server error",
"code", builder.status,
"text", http.StatusText(builder.status),
"url", request.URL.String(),
"kind", "body",
"body", string(body),
)
logger, ok := request.Context().Value(LoggerKey{}).(*slog.Logger)

if ok && logger != nil {
logger.Error(
"detected server error",
"code", builder.status,
"text", http.StatusText(builder.status),
"url", request.URL.String(),
"kind", "body",
"body", string(body),
)
}
}

writer.Write(body)
Expand All @@ -88,15 +92,17 @@ func DefaultResponderHandler(writer http.ResponseWriter, request *http.Request,

if builder.stream != nil {
if writeHeaders(writer, builder) {
logger := request.Context().Value(LoggerKey{}).(*slog.Logger)

logger.Error(
"detected server error",
"code", builder.status,
"text", http.StatusText(builder.status),
"url", request.URL.String(),
"kind", "stream",
)
logger, ok := request.Context().Value(LoggerKey{}).(*slog.Logger)

if ok && logger != nil {
logger.Error(
"detected server error",
"code", builder.status,
"text", http.StatusText(builder.status),
"url", request.URL.String(),
"kind", "stream",
)
}
}

writer.(http.Flusher).Flush()
Expand All @@ -117,15 +123,17 @@ func DefaultResponderHandler(writer http.ResponseWriter, request *http.Request,
}

if writeHeaders(writer, builder) {
logger := request.Context().Value(LoggerKey{}).(*slog.Logger)

logger.Error(
"detected server error",
"code", builder.status,
"text", http.StatusText(builder.status),
"url", request.URL.String(),
"kind", "default",
)
logger, ok := request.Context().Value(LoggerKey{}).(*slog.Logger)

if ok && logger != nil {
logger.Error(
"detected server error",
"code", builder.status,
"text", http.StatusText(builder.status),
"url", request.URL.String(),
"kind", "default",
)
}
}
}

Expand Down

0 comments on commit 0b2a8ac

Please sign in to comment.