Skip to content

Commit 33b9038

Browse files
committed
Override http server's error logger
Signed-off-by: Doğukan Teber <[email protected]>
1 parent c947e7c commit 33b9038

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

gateway/proxy.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"os"
1212
"time"
1313

14+
"github.com/cortexproject/auth-gateway/utils"
1415
"github.com/sirupsen/logrus"
1516
)
1617

@@ -54,13 +55,6 @@ type Proxy struct {
5455
reverseProxy *httputil.ReverseProxy
5556
}
5657

57-
type logrusErrorWriter struct{}
58-
59-
func (w logrusErrorWriter) Write(p []byte) (n int, err error) {
60-
logrus.Errorf("%s", string(p))
61-
return len(p), nil
62-
}
63-
6458
func NewProxy(targetURL string, upstream Upstream, component string) (*Proxy, error) {
6559
url, err := url.Parse(targetURL)
6660
if err != nil {
@@ -74,7 +68,7 @@ func NewProxy(targetURL string, upstream Upstream, component string) (*Proxy, er
7468
reverseProxy.Transport = customTransport(component, upstream)
7569
originalDirector := reverseProxy.Director
7670
reverseProxy.Director = customDirector(url, originalDirector)
77-
reverseProxy.ErrorLog = log.New(logrusErrorWriter{}, "", 0)
71+
reverseProxy.ErrorLog = log.New(utils.LogrusErrorWriter{}, "", 0)
7872

7973
if upstream.HTTPClientTimeout == 0 {
8074
upstream.HTTPClientTimeout = defaultTimeoutValues[component].HTTPClientTimeout

server/server.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ package server
33
import (
44
"context"
55
"fmt"
6+
"log"
67
"net"
78
"net/http"
89
"net/http/pprof"
910
"time"
1011

1112
"github.com/cortexproject/auth-gateway/middleware"
13+
"github.com/cortexproject/auth-gateway/utils"
1214
"github.com/prometheus/client_golang/prometheus"
1315
"github.com/prometheus/client_golang/prometheus/promauto"
1416
"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -102,6 +104,7 @@ func initAuthServer(cfg *Config, middlewares []middleware.Interface) (*server, e
102104
ReadTimeout: readTimeout,
103105
WriteTimeout: writeTimeout,
104106
IdleTimeout: idleTimeout,
107+
ErrorLog: log.New(utils.LogrusErrorWriter{}, "", 0),
105108
}
106109

107110
return &server{
@@ -157,6 +160,7 @@ func initUnAuthServer(cfg *Config, middlewares []middleware.Interface) (*server,
157160
ReadTimeout: readTimeout,
158161
WriteTimeout: writeTimeout,
159162
IdleTimeout: idleTimeout,
163+
ErrorLog: log.New(utils.LogrusErrorWriter{}, "", 0),
160164
}
161165

162166
return &server{
@@ -218,7 +222,7 @@ func New(cfg Config) (*Server, error) {
218222
}
219223

220224
func (s *Server) Run() error {
221-
fmt.Println("server has started")
225+
logrus.Infof("the server has started listening on %v", s.authServer.httpServer.Addr)
222226
errChan := make(chan error, 1)
223227

224228
go func() {

utils/utils.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package utils
2+
3+
import "github.com/sirupsen/logrus"
4+
5+
type LogrusErrorWriter struct{}
6+
7+
func (w LogrusErrorWriter) Write(p []byte) (n int, err error) {
8+
logrus.Errorf("%s", string(p))
9+
return len(p), nil
10+
}

0 commit comments

Comments
 (0)