mirror of
https://github.com/pomerium/pomerium.git
synced 2025-08-03 00:40:25 +02:00
logging: remove ctx from global log methods (#5337)
* log: remove warn * log: update debug * log: update info * remove level, log * remove contextLogger function
This commit is contained in:
parent
1ccaf1b22b
commit
d2c14cd6d2
53 changed files with 150 additions and 198 deletions
|
@ -73,7 +73,7 @@ func main() {
|
|||
return
|
||||
}
|
||||
}
|
||||
log.Info(ctx).Str("url", *to).Msg("echo server")
|
||||
log.Ctx(ctx).Info().Str("url", *to).Msg("echo server")
|
||||
|
||||
eg.Go(func() error {
|
||||
return run(ctx, conn, *toURL, *domain, opts{
|
||||
|
@ -114,7 +114,7 @@ func run(ctx context.Context, conn *grpc.ClientConn, to url.URL, domain string,
|
|||
changed[j] = idx
|
||||
cfg.Routes[idx] = makeRoute(domain, to)
|
||||
}
|
||||
log.Info(ctx).Ints("changed", changed).Msg("changed")
|
||||
log.Ctx(ctx).Info().Ints("changed", changed).Msg("changed")
|
||||
if err := saveAndLogConfig(ctx, dbc, cfg, o.graceful); err != nil {
|
||||
return err
|
||||
}
|
||||
|
@ -175,7 +175,7 @@ func waitHealthy(ctx context.Context, _ *http.Client, routes []*config.Route) er
|
|||
return err
|
||||
}
|
||||
|
||||
log.Info(ctx).
|
||||
log.Ctx(ctx).Info().
|
||||
Int("routes", len(routes)).
|
||||
Str("elapsed", time.Since(now).String()).
|
||||
Msg("ok")
|
||||
|
@ -195,6 +195,6 @@ func saveConfig(ctx context.Context, client databroker.DataBrokerServiceClient,
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
log.Info(ctx).Uint64("version", r.GetRecord().GetVersion()).Msg("set config")
|
||||
log.Ctx(ctx).Info().Uint64("version", r.GetRecord().GetVersion()).Msg("set config")
|
||||
return nil
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue