log: remove log "module" system
After comtemplation, the complexity of the logging module system outweighs its usefulness. This changeset removes the system and restores lighter weight code paths. As a concession, we can always provide more context when necessary to log messages to understand them without having to fork the context for a certain set of calls. Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
@@ -79,7 +79,7 @@ func main() {
|
||||
start = time.Now()
|
||||
signals = make(chan os.Signal, 2048)
|
||||
serverC = make(chan *server.Server, 1)
|
||||
ctx = log.WithModule(gocontext.Background(), "containerd")
|
||||
ctx = gocontext.Background()
|
||||
config = defaultConfig()
|
||||
)
|
||||
|
||||
@@ -114,21 +114,21 @@ func main() {
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "failed to get listener for debug endpoint")
|
||||
}
|
||||
serve(log.WithModule(ctx, "debug"), l, server.ServeDebug)
|
||||
serve(ctx, l, server.ServeDebug)
|
||||
}
|
||||
if config.Metrics.Address != "" {
|
||||
l, err := net.Listen("tcp", config.Metrics.Address)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "failed to get listener for metrics endpoint")
|
||||
}
|
||||
serve(log.WithModule(ctx, "metrics"), l, server.ServeMetrics)
|
||||
serve(ctx, l, server.ServeMetrics)
|
||||
}
|
||||
|
||||
l, err := sys.GetLocalListener(address, config.GRPC.UID, config.GRPC.GID)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "failed to get listener for main endpoint")
|
||||
}
|
||||
serve(log.WithModule(ctx, "grpc"), l, server.ServeGRPC)
|
||||
serve(ctx, l, server.ServeGRPC)
|
||||
|
||||
log.G(ctx).Infof("containerd successfully booted in %fs", time.Since(start).Seconds())
|
||||
<-done
|
||||
|
||||
Reference in New Issue
Block a user