mirror of
https://github.com/sot-tech/mochi.git
synced 2026-07-09 10:08:11 -07:00
(minor) unify log keys
This commit is contained in:
@@ -58,7 +58,7 @@ func NewFrontends(configs []conf.NamedMapConfig, logic *middleware.Logic) (fs []
|
||||
buildersMU.RLock()
|
||||
defer buildersMU.RUnlock()
|
||||
for _, c := range configs {
|
||||
logger.Debug().Object("frontend", c).Msg("starting frontend")
|
||||
logger.Debug().Str("name", c.Name).Object("config", c).Msg("starting frontend")
|
||||
newFrontend, ok := builders[c.Name]
|
||||
if !ok {
|
||||
err = fmt.Errorf("hook with name '%s' does not exists", c.Name)
|
||||
|
||||
@@ -207,6 +207,7 @@ func NewFrontend(c conf.MapConfig, logic *middleware.Logic) (frontend.Frontend,
|
||||
}
|
||||
|
||||
func runServer(s *fasthttp.Server, cfg *Config) {
|
||||
logger.Debug().Str("addr", cfg.Addr).Msg("starting listener")
|
||||
ln, err := cfg.ListenTCP()
|
||||
if err == nil {
|
||||
if s.TLSConfig == nil {
|
||||
@@ -217,9 +218,9 @@ func runServer(s *fasthttp.Server, cfg *Config) {
|
||||
}
|
||||
defer ln.Close()
|
||||
if err == nil {
|
||||
logger.Info().Msg("server stopped")
|
||||
logger.Info().Str("addr", cfg.Addr).Msg("listener stopped")
|
||||
} else if !errors.Is(err, http.ErrServerClosed) {
|
||||
logger.Fatal().Err(err).Msg("server failed")
|
||||
logger.Fatal().Str("addr", cfg.Addr).Err(err).Msg("listener failed")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -33,5 +33,5 @@ func (qp queryParams) InfoHashes() bittorrent.InfoHashes {
|
||||
|
||||
// MarshalZerologObject writes fields into zerolog event
|
||||
func (qp queryParams) MarshalZerologObject(e *zerolog.Event) {
|
||||
e.Stringer("query", qp.Args)
|
||||
e.Str("query", str2bytes.BytesToString(qp.Args.QueryString()))
|
||||
}
|
||||
|
||||
@@ -137,12 +137,15 @@ func NewFrontend(c conf.MapConfig, logic *middleware.Logic) (frontend.Frontend,
|
||||
|
||||
var ctx context.Context
|
||||
ctx, f.ctxCancel = context.WithCancel(context.Background())
|
||||
logger.Debug().Str("addr", cfg.Addr).Msg("starting listener")
|
||||
for i := range f.sockets {
|
||||
if f.sockets[i], err = cfg.ListenUDP(); err == nil {
|
||||
f.wg.Add(1)
|
||||
go func(socket *net.UDPConn, ctx context.Context) {
|
||||
if err := f.serve(ctx, socket); err != nil {
|
||||
logger.Fatal().Err(err).Msg("server failed")
|
||||
logger.Fatal().Str("addr", cfg.Addr).Err(err).Msg("listener failed")
|
||||
} else {
|
||||
logger.Info().Str("addr", cfg.Addr).Msg("listener stopped")
|
||||
}
|
||||
}(f.sockets[i], ctx)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user