Skip to content

Commit

Permalink
use right logger in balance handler
Browse files Browse the repository at this point in the history
  • Loading branch information
fraidev committed Dec 21, 2023
1 parent 9619ace commit fcb4b4c
Showing 1 changed file with 19 additions and 11 deletions.
30 changes: 19 additions & 11 deletions utils/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package utils

import (
"log"
"net/http"
"net/url"
"os"
"regexp"
Expand Down Expand Up @@ -257,19 +258,32 @@ func NewConfig() *Config {

balancer := balancers.NewIPHashBalancer(targets, retryTarget, configFile.LoadBalancer.TTL, store)

bunchWriter := diode.NewWriter(
os.Stdout,
configFile.Logger.BunchSize,
time.Duration(configFile.Logger.PoolIntervalSeconds)*time.Second, func(missed int) {
log.Printf("Logger Dropped %d messages", missed)
})

logger := zerolog.New(bunchWriter)

logger.Info().Msg("Starting tzproxy")
proxyConfig := middleware.ProxyConfig{
Skipper: middleware.DefaultSkipper,
ContextKey: "target",
RetryCount: 0,
Balancer: balancer,
RetryFilter: func(c echo.Context, err error) bool {
log.Printf("lel \n")
log.Printf("RetryFilter: %v", err)
c.Logger().Error(err)
if httpErr, ok := err.(*echo.HTTPError); ok {
if httpErr.Code == http.StatusBadGateway || httpErr.Code == http.StatusNotFound || httpErr.Code == http.StatusGone {
return true
}
}

return false
},
ErrorHandler: func(c echo.Context, err error) error {
c.Set("retry", true)
logger.Error().Err(err).Msg("proxy error")
c.Logger().Error(err)
return err
},
Expand Down Expand Up @@ -310,13 +324,7 @@ func NewConfig() *Config {
config.CacheDisabledRoutesRegex = append(config.CacheDisabledRoutesRegex, regex)
}

bunchWriter := diode.NewWriter(
os.Stdout,
config.ConfigFile.Logger.BunchSize,
time.Duration(configFile.Logger.PoolIntervalSeconds)*time.Second, func(missed int) {
log.Printf("Logger Dropped %d messages", missed)
})
config.Logger = zerolog.New(bunchWriter)
config.Logger = logger

config.RequestLoggerConfig = &middleware.RequestLoggerConfig{
LogLatency: true,
Expand Down

0 comments on commit fcb4b4c

Please sign in to comment.