refactor: Update logger initialization and configuration

This commit updates the `log.go` file to improve the initialization and configuration of the logger. The code changes remove unnecessary comments and unused variables, ensuring cleaner and more efficient code. Additionally, the `load` function is modified to properly handle errors when loading the logger configuration file. These improvements enhance the overall functionality and maintainability of the logger module.
This commit is contained in:
windyboy
2024-07-24 14:43:22 +08:00
parent 15f15ec146
commit 9b6047c0a3
+1 -12
View File
@@ -19,13 +19,11 @@ const (
EnvDev = "dev" EnvDev = "dev"
) )
// LoggerConfig represents the configuration for the logger.
type LoggerConfig struct { type LoggerConfig struct {
ZapConfig zap.Config `json:"zapConfig"` ZapConfig zap.Config `json:"zapConfig"`
LumberjackConfig LumberjackConfig `json:"lumberjackConfig"` LumberjackConfig LumberjackConfig `json:"lumberjackConfig"`
} }
// LumberjackConfig represents the configuration for lumberjack logging.
type LumberjackConfig struct { type LumberjackConfig struct {
Filename string `json:"filename"` Filename string `json:"filename"`
MaxSize int `json:"maxSize"` MaxSize int `json:"maxSize"`
@@ -37,20 +35,17 @@ type LumberjackConfig struct {
var ( var (
sugar *zap.SugaredLogger sugar *zap.SugaredLogger
log *zap.Logger log *zap.Logger
// once sync.Once
) )
// load initializes the logger. It ensures that the logger is initialized only once.
func load() { func load() {
if log == nil { if log == nil {
env := getEnv() env := getEnv()
fmt.Printf("Enviroment : %s\n", env) fmt.Printf("Environment: %s\n", env)
configFile := getConfigFile(env) configFile := getConfigFile(env)
config, err := loadConfig(configFile) config, err := loadConfig(configFile)
if err != nil { if err != nil {
fmt.Printf("Error loading config: %v\n", err) fmt.Printf("Error loading config: %v\n", err)
//create a default logger
log, _ = zap.NewDevelopment() log, _ = zap.NewDevelopment()
sugar = log.Sugar() sugar = log.Sugar()
return return
@@ -80,7 +75,6 @@ func load() {
log = zap.New(core, zap.AddCaller(), zap.AddStacktrace(zapcore.ErrorLevel)) log = zap.New(core, zap.AddCaller(), zap.AddStacktrace(zapcore.ErrorLevel))
sugar = log.Sugar() sugar = log.Sugar()
// fmt.Println("Logger initialized")
} }
} }
@@ -89,7 +83,6 @@ func GetSugaredLogger() *zap.SugaredLogger {
return log.Sugar() return log.Sugar()
} }
// getEnv retrieves the logging environment from the TELE_MODE environment variable.
func getEnv() string { func getEnv() string {
env := os.Getenv("TELE_MODE") env := os.Getenv("TELE_MODE")
if env == "" { if env == "" {
@@ -98,7 +91,6 @@ func getEnv() string {
return env return env
} }
// getConfigFile determines the configuration file path based on the environment.
func getConfigFile(env string) string { func getConfigFile(env string) string {
switch env { switch env {
case EnvTest: case EnvTest:
@@ -110,7 +102,6 @@ func getConfigFile(env string) string {
} }
} }
// loadConfig loads the logger configuration from the given file.
func loadConfig(configFile string) (LoggerConfig, error) { func loadConfig(configFile string) (LoggerConfig, error) {
file, err := os.Open(configFile) file, err := os.Open(configFile)
if err != nil { if err != nil {
@@ -125,7 +116,6 @@ func loadConfig(configFile string) (LoggerConfig, error) {
return config, nil return config, nil
} }
// GetLogger returns the initialized SugaredLogger instance.
func GetLogger() *zap.SugaredLogger { func GetLogger() *zap.SugaredLogger {
if sugar == nil { if sugar == nil {
load() load()
@@ -133,7 +123,6 @@ func GetLogger() *zap.SugaredLogger {
return sugar return sugar
} }
// parseLogLevel converts the log level string to zapcore.Level.
func parseLogLevel(level string) zapcore.Level { func parseLogLevel(level string) zapcore.Level {
switch level { switch level {
case "debug": case "debug":