don't set logger default level twice (crowdsecurity#1336)

superben2010 · Mar 10, 2022 · e7de05d · e7de05d
1 parent aca37a3
commit e7de05d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/plugins/notifications/email/main.go b/plugins/notifications/email/main.go
@@ -14,7 +14,7 @@ import (
 
 var logger hclog.Logger = hclog.New(&hclog.LoggerOptions{
 	Name:       "email-plugin",
-	Level:      hclog.LevelFromString("DEBUG"),
+	Level:      hclog.LevelFromString("INFO"),
 	Output:     os.Stderr,
 	JSONFormat: true,
 })
@@ -97,11 +97,11 @@ func (n *EmailPlugin) Notify(ctx context.Context, notification *protobufs.Notifi
 		return nil, fmt.Errorf("invalid plugin config name %s", notification.Name)
 	}
 	cfg := n.ConfigByName[notification.Name]
+
 	if cfg.LogLevel != nil && *cfg.LogLevel != "" {
 		logger.SetLevel(hclog.LevelFromString(*cfg.LogLevel))
-	} else {
-		logger.SetLevel(hclog.Info)
 	}
+
 	logger = logger.Named(cfg.Name)
 	logger.Debug("got notification")
 

diff --git a/plugins/notifications/http/main.go b/plugins/notifications/http/main.go
@@ -30,7 +30,7 @@ type HTTPPlugin struct {
 
 var logger hclog.Logger = hclog.New(&hclog.LoggerOptions{
 	Name:       "http-plugin",
-	Level:      hclog.LevelFromString("DEBUG"),
+	Level:      hclog.LevelFromString("INFO"),
 	Output:     os.Stderr,
 	JSONFormat: true,
 })
@@ -40,10 +40,9 @@ func (s *HTTPPlugin) Notify(ctx context.Context, notification *protobufs.Notific
 		return nil, fmt.Errorf("invalid plugin config name %s", notification.Name)
 	}
 	cfg := s.PluginConfigByName[notification.Name]
+
 	if cfg.LogLevel != nil && *cfg.LogLevel != "" {
 		logger.SetLevel(hclog.LevelFromString(*cfg.LogLevel))
-	} else {
-		logger.SetLevel(hclog.Info)
 	}
 
 	logger.Info(fmt.Sprintf("received signal for %s config", notification.Name))

diff --git a/plugins/notifications/slack/main.go b/plugins/notifications/slack/main.go
@@ -24,7 +24,7 @@ type Notify struct {
 
 var logger hclog.Logger = hclog.New(&hclog.LoggerOptions{
 	Name:       "slack-plugin",
-	Level:      hclog.LevelFromString("DEBUG"),
+	Level:      hclog.LevelFromString("INFO"),
 	Output:     os.Stderr,
 	JSONFormat: true,
 })
@@ -34,10 +34,9 @@ func (n *Notify) Notify(ctx context.Context, notification *protobufs.Notificatio
 		return nil, fmt.Errorf("invalid plugin config name %s", notification.Name)
 	}
 	cfg := n.ConfigByName[notification.Name]
+
 	if cfg.LogLevel != nil && *cfg.LogLevel != "" {
 		logger.SetLevel(hclog.LevelFromString(*cfg.LogLevel))
-	} else {
-		logger.SetLevel(hclog.Info)
 	}
 
 	logger.Info(fmt.Sprintf("found notify signal for %s config", notification.Name))

diff --git a/plugins/notifications/splunk/main.go b/plugins/notifications/splunk/main.go
@@ -19,7 +19,7 @@ import (
 
 var logger hclog.Logger = hclog.New(&hclog.LoggerOptions{
 	Name:       "splunk-plugin",
-	Level:      hclog.LevelFromString("DEBUG"),
+	Level:      hclog.LevelFromString("INFO"),
 	Output:     os.Stderr,
 	JSONFormat: true,
 })
@@ -45,11 +45,11 @@ func (s *Splunk) Notify(ctx context.Context, notification *protobufs.Notificatio
 		return &protobufs.Empty{}, fmt.Errorf("splunk invalid config name %s", notification.Name)
 	}
 	cfg := s.PluginConfigByName[notification.Name]
+
 	if cfg.LogLevel != nil && *cfg.LogLevel != "" {
 		logger.SetLevel(hclog.LevelFromString(*cfg.LogLevel))
-	} else {
-		logger.SetLevel(hclog.Info)
 	}
+
 	logger.Info(fmt.Sprintf("received notify signal for %s config", notification.Name))
 
 	p := Payload{Event: notification.Text}