address comments.

Signed-off-by: morvencao <lcao@redhat.com>

Author: morvencao

cmd/maestro/environments/framework.go

@@ -17,6 +17,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
+	envtypes "github.com/openshift-online/maestro/cmd/maestro/environments/types"
 	"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
 )
 
@@ -27,16 +28,13 @@ func init() {
 		// Create the configuration
 		environment.Config = config.NewApplicationConfig()
 		environment.ApplicationConfig = ApplicationConfig{config.NewApplicationConfig()}
-		environment.Name = GetEnvironmentStrFromEnv()
+		environment.Name = envtypes.GetEnvironmentStrFromEnv()
 
 		environments = map[string]EnvironmentImpl{
-			DevelopmentEnv: &devEnvImpl{environment},
-			TestingEnv:     &testingEnvImpl{environment},
-			ProductionEnv:  &productionEnvImpl{environment},
+			envtypes.DevelopmentEnv: &devEnvImpl{environment},
+			envtypes.TestingEnv:     &testingEnvImpl{environment},
+			envtypes.ProductionEnv:  &productionEnvImpl{environment},
 		}
-
-		// initialize the logger
-		logger.InitLogger(environment.Name)
 	})
 }
 
@@ -59,14 +57,6 @@ type EnvironmentImpl interface {
 	VisitClients(c *Clients) error
 }
 
-func GetEnvironmentStrFromEnv() string {
-	envStr, specified := os.LookupEnv(EnvironmentStringKey)
-	if !specified || envStr == "" {
-		envStr = EnvironmentDefault
-	}
-	return envStr
-}
-
 func Environment() *Env {
 	return environment
 }
@@ -269,7 +259,7 @@ func (e *Env) InitializeSentry() error {
 }
 
 func (e *Env) Teardown() {
-	if e.Name != TestingEnv {
+	if e.Name != envtypes.TestingEnv {
 		if err := e.Database.SessionFactory.Close(); err != nil {
 			log.Fatalf("Unable to close db connection: %s", err.Error())
 		}

cmd/maestro/environments/types/environments.go

@@ -0,0 +1,20 @@
+package types
+
+import "os"
+
+const (
+	TestingEnv     string = "testing"
+	DevelopmentEnv string = "development"
+	ProductionEnv  string = "production"
+
+	EnvironmentStringKey string = "MAESTRO_ENV"
+	EnvironmentDefault   string = DevelopmentEnv
+)
+
+func GetEnvironmentStrFromEnv() string {
+	envStr, specified := os.LookupEnv(EnvironmentStringKey)
+	if !specified || envStr == "" {
+		envStr = EnvironmentDefault
+	}
+	return envStr
+}

cmd/maestro/main.go

@@ -47,7 +47,7 @@ func main() {
 	viper.SetDefault(varLogLevel, "info")
 	if err := viper.ReadInConfig(); err != nil {
 		if _, ok := err.(*os.PathError); ok {
-			log.Infof("no config file '%s' not found", logConfigFile)
+			log.Infof("no config file '%s'", logConfigFile)
 		} else {
 			log.Errorf("failed to read the config file '%s': %v", logConfigFile, err)
 		}

pkg/dispatcher/hash_dispatcher.go

@@ -196,7 +196,7 @@ func (d *HashDispatcher) updateConsumerSet() error {
 
 	_ = d.consumerSet.Append(toAddConsumers...)
 	d.consumerSet.RemoveAll(toRemoveConsumers...)
-	log.Infof("Consumers set for current instance: %s", d.consumerSet.String())
+	log.Debugf("Consumers set for current instance: %s", d.consumerSet.String())
 
 	return nil
 }

pkg/logger/zap.go

@@ -1,8 +1,7 @@
 package logger
 
 import (
-	"sync"
-
+	envtypes "github.com/openshift-online/maestro/cmd/maestro/environments/types"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
@@ -12,49 +11,29 @@ import (
 var (
 	zapLogLevel zap.AtomicLevel
 	zapLogger   *zap.SugaredLogger
-	once        sync.Once
 )
 
-// InitLogger initializes the logger with the given environment.
-// Must be called before using the logger.
-func InitLogger(env string) {
-	once.Do(func() {
+// GetLogger returns the singleton logger instance, initializing it
+// with the given environment if necessary.
+func GetLogger() *zap.SugaredLogger {
+	if zapLogger == nil {
 		zapLogLevel = zap.NewAtomicLevel()
 		zapConfig := zap.NewDevelopmentConfig()
 		zapConfig.DisableStacktrace = true
 		zapConfig.Encoding = "console"
-		if env == "development" {
+		if envtypes.GetEnvironmentStrFromEnv() == "development" {
 			zapLogLevel.SetLevel(zapcore.DebugLevel)
 		} else {
 			zapLogLevel.SetLevel(zapcore.InfoLevel)
 		}
-		zapConfig.Level = zapLogLevel
-		zlog, err := zapConfig.Build()
-		if err != nil {
-			panic(err)
-		}
-
-		zapLogger = zlog.Sugar()
-	})
-}
-
-// GetLogger returns the singleton logger instance.
-func GetLogger() *zap.SugaredLogger {
-	if zapLogger == nil {
-		zapLogLevel = zap.NewAtomicLevel()
-		zapConfig := zap.NewDevelopmentConfig()
-		zapConfig.DisableStacktrace = true
-		zapConfig.Encoding = "console"
 		zapLogLevel.SetLevel(zapcore.InfoLevel)
 		zapConfig.Level = zapLogLevel
 		zlog, err := zapConfig.Build()
 		if err != nil {
 			panic(err)
 		}
-
 		zapLogger = zlog.Sugar()
 	}
-
 	return zapLogger
 }
 

test/helper.go

@@ -36,6 +36,8 @@ import (
 	"github.com/segmentio/ksuid"
 	"github.com/spf13/pflag"
 
+	envtypes "github.com/openshift-online/maestro/cmd/maestro/environments/types"
+
 	amv1 "github.com/openshift-online/ocm-sdk-go/accountsmgmt/v1"
 
 	"github.com/openshift-online/maestro/cmd/maestro/environments"
@@ -102,7 +104,7 @@ func NewHelper(t *testing.T) *Helper {
 
 		env := helper.Env()
 		// Manually set environment name, ignoring environment variables
-		env.Name = environments.TestingEnv
+		env.Name = envtypes.TestingEnv
 		err = env.AddFlags(pflag.CommandLine)
 		if err != nil {
 			log.Fatalf("Unable to add environment flags: %s", err.Error())