|
7 | 7 | "time"
|
8 | 8 |
|
9 | 9 | "go.strv.io/net"
|
10 |
| - "go.strv.io/net/internal" |
11 | 10 | )
|
12 | 11 |
|
13 | 12 | const (
|
@@ -65,9 +64,9 @@ func RecoverMiddleware(l *slog.Logger, opts ...RecoverMiddlewareOption) func(htt
|
65 | 64 | return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
66 | 65 | defer func() {
|
67 | 66 | if re := recover(); re != nil {
|
68 |
| - rw, ok := w.(*internal.ResponseWriter) |
| 67 | + rw, ok := w.(*ResponseWriter) |
69 | 68 | if !ok {
|
70 |
| - rw = internal.NewResponseWriter(w, l) |
| 69 | + rw = NewResponseWriter(w, l) |
71 | 70 | }
|
72 | 71 |
|
73 | 72 | rw.SetPanicObject(re)
|
@@ -101,9 +100,9 @@ func RecoverMiddleware(l *slog.Logger, opts ...RecoverMiddlewareOption) func(htt
|
101 | 100 | func LoggingMiddleware(l *slog.Logger) func(http.Handler) http.Handler {
|
102 | 101 | return func(next http.Handler) http.Handler {
|
103 | 102 | return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
104 |
| - rw, ok := w.(*internal.ResponseWriter) |
| 103 | + rw, ok := w.(*ResponseWriter) |
105 | 104 | if !ok {
|
106 |
| - rw = internal.NewResponseWriter(w, l) |
| 105 | + rw = NewResponseWriter(w, l) |
107 | 106 | }
|
108 | 107 |
|
109 | 108 | requestStart := time.Now()
|
@@ -156,7 +155,7 @@ func (r RequestData) LogValue() slog.Value {
|
156 | 155 | }
|
157 | 156 |
|
158 | 157 | // withRequestData returns slog with filled fields.
|
159 |
| -func withRequestData(l *slog.Logger, rw *internal.ResponseWriter, rd RequestData) *slog.Logger { |
| 158 | +func withRequestData(l *slog.Logger, rw *ResponseWriter, rd RequestData) *slog.Logger { |
160 | 159 | errorObject := rw.ErrorObject()
|
161 | 160 | panicObject := rw.PanicObject()
|
162 | 161 | if errorObject != nil {
|
|
0 commit comments