Customize zlog's global logger

Signed-off-by: Ivan Sim <[email protected]>

cmd/controller/main.go

@@ -2,14 +2,24 @@ package main
 
 import (
 	"context"
+	"os"
+	"time"
 
-	"github.com/ihcsim/k8s-dra/cmd"
+	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 )
 
+func init() {
+	console := zerolog.ConsoleWriter{
+		Out:        os.Stderr,
+		TimeFormat: time.RFC3339,
+	}
+	log.Logger = log.Logger.Output(console).With().Caller().Logger()
+}
+
 func main() {
 	ctx := context.Background()
-	if err := cmd.ExecuteContext(ctx); err != nil {
+	if err := executeContext(ctx); err != nil {
 		log.Fatal().Err(err).Msg("failed to execute command")
 	}
 }

cmd/controller/root.go

@@ -1,19 +1,17 @@
-package cmd
+package main
 
 import (
 	"context"
 	"fmt"
 	"net/http"
 	"net/http/pprof"
-	"os"
 	"time"
 
 	"github.com/ihcsim/k8s-dra/cmd/flags"
 	draclientset "github.com/ihcsim/k8s-dra/pkg/apis/clientset/versioned"
 	"github.com/ihcsim/k8s-dra/pkg/drivers/gpu"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/rs/zerolog"
-	zlog "github.com/rs/zerolog/log"
+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"k8s.io/client-go/informers"
@@ -24,8 +22,6 @@ import (
 )
 
 var (
-	log = zlog.Logger
-
 	rootCmd = &cobra.Command{
 		Use:   "dra-ctrl",
 		Short: "dra-ctrl implements a Kubernetes DRA driver controller",
@@ -36,17 +32,14 @@ var (
 )
 
 func init() {
-	log = log.Output(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339})
-	log = log.With().Caller().Logger()
-
 	rootCmd.PersistentFlags().AddFlagSet(flags.NewK8sFlags())
 	rootCmd.PersistentFlags().AddFlagSet(flags.NewControllerFlags())
 	if err := viper.BindPFlags(rootCmd.PersistentFlags()); err != nil {
 		log.Fatal().Err(err).Msg("failed to bind flags")
 	}
 }
 
-func ExecuteContext(ctx context.Context) error {
+func executeContext(ctx context.Context) error {
 	return rootCmd.ExecuteContext(ctx)
 }
 
@@ -105,8 +98,8 @@ func run(ctx context.Context) error {
 	)
 	informerFactory.Start(ctx.Done())
 
-	dlog := log.With().Str("namespace", namespace).Logger()
-	driver, err := gpu.NewDriver(draClientSets, namespace, dlog)
+	driverLog := log.Logger.With().Str("namespace", namespace).Logger()
+	driver, err := gpu.NewDriver(draClientSets, namespace, driverLog)
 	if err != nil {
 		return err
 	}