From 3b7a675e73a1bffa4c50eca44bb5bc7e042e54ad Mon Sep 17 00:00:00 2001 From: Matt Moore Date: Sat, 25 Apr 2020 15:48:50 -0700 Subject: [PATCH] Revert "Use loggers when emitting count messages (#1239)" (#1248) This reverts commit c13917eb2547608c284375c483c2d5c14fc24ff7. --- injection/sharedmain/main.go | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/injection/sharedmain/main.go b/injection/sharedmain/main.go index ac3e26ae0..b0d30771d 100644 --- a/injection/sharedmain/main.go +++ b/injection/sharedmain/main.go @@ -133,14 +133,10 @@ func MainWithContext(ctx context.Context, component string, ctors ...injection.C // MainWithConfig runs the generic main flow for non-webhook controllers. Use // WebhookMainWithConfig if you need to serve webhooks. func MainWithConfig(ctx context.Context, component string, cfg *rest.Config, ctors ...injection.ControllerConstructor) { - logger, atomicLevel := SetupLoggerOrDie(ctx, component) - defer flush(logger) - ctx = logging.WithLogger(ctx, logger) - - logger.Infof("Registering %d clients", len(injection.Default.GetClients())) - logger.Infof("Registering %d informer factories", len(injection.Default.GetInformerFactories())) - logger.Infof("Registering %d informers", len(injection.Default.GetInformers())) - logger.Infof("Registering %d controllers", len(ctors)) + log.Printf("Registering %d clients", len(injection.Default.GetClients())) + log.Printf("Registering %d informer factories", len(injection.Default.GetInformerFactories())) + log.Printf("Registering %d informers", len(injection.Default.GetInformers())) + log.Printf("Registering %d controllers", len(ctors)) MemStatsOrDie(ctx) @@ -150,6 +146,9 @@ func MainWithConfig(ctx context.Context, component string, cfg *rest.Config, cto ctx, informers := injection.Default.SetupInformers(ctx, cfg) + logger, atomicLevel := SetupLoggerOrDie(ctx, component) + defer flush(logger) + ctx = logging.WithLogger(ctx, logger) profilingHandler := profiling.NewHandler(logger, false) profilingServer := profiling.NewServer(profilingHandler) eg, egCtx := errgroup.WithContext(ctx) @@ -211,14 +210,10 @@ func WebhookMainWithContext(ctx context.Context, component string, ctors ...inje // with the given config. Use MainWithConfig if you do not need to serve // webhooks. func WebhookMainWithConfig(ctx context.Context, component string, cfg *rest.Config, ctors ...injection.ControllerConstructor) { - logger, atomicLevel := SetupLoggerOrDie(ctx, component) - defer flush(logger) - ctx = logging.WithLogger(ctx, logger) - - logger.Infof("Registering %d clients", len(injection.Default.GetClients())) - logger.Infof("Registering %d informer factories", len(injection.Default.GetInformerFactories())) - logger.Infof("Registering %d informers", len(injection.Default.GetInformers())) - logger.Infof("Registering %d controllers", len(ctors)) + log.Printf("Registering %d clients", len(injection.Default.GetClients())) + log.Printf("Registering %d informer factories", len(injection.Default.GetInformerFactories())) + log.Printf("Registering %d informers", len(injection.Default.GetInformers())) + log.Printf("Registering %d controllers", len(ctors)) MemStatsOrDie(ctx) @@ -227,6 +222,9 @@ func WebhookMainWithConfig(ctx context.Context, component string, cfg *rest.Conf cfg.Burst = len(ctors) * rest.DefaultBurst ctx, informers := injection.Default.SetupInformers(ctx, cfg) + logger, atomicLevel := SetupLoggerOrDie(ctx, component) + defer flush(logger) + ctx = logging.WithLogger(ctx, logger) profilingHandler := profiling.NewHandler(logger, false) profilingServer := profiling.NewServer(profilingHandler)