logging: Fixed debug log level checks.

metal-toolbox · Mar 28, 2023 · 963a846 · 963a846
1 parent a248450
commit 963a846
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/internal/app/app.go b/internal/app/app.go
@@ -117,7 +117,7 @@ func Run(ctx context.Context, osArgs []string, h *common.Health, optLoggerConfig
 
 	eg.Go(func() error {
 		err := logDirReader.Wait()
-		if logger.Level() == zap.DebugLevel {
+		if logger.Level().Enabled(zap.DebugLevel) {
 			logger.Debugf("linux audit log dir reader worker exited (%v)", err)
 		}
 		return err
@@ -143,7 +143,7 @@ func Run(ctx context.Context, osArgs []string, h *common.Health, optLoggerConfig
 		}
 
 		err := jp.Read(groupCtx)
-		if logger.Level() == zap.DebugLevel {
+		if logger.Level().Enabled(zap.DebugLevel) {
 			logger.Debugf("journald worker exited (%v)", err)
 		}
 		return err
@@ -160,7 +160,7 @@ func Run(ctx context.Context, osArgs []string, h *common.Health, optLoggerConfig
 		}
 
 		err := ap.Read(groupCtx)
-		if logger.Level() == zap.DebugLevel {
+		if logger.Level().Enabled(zap.DebugLevel) {
 			logger.Debugf("audit worker exited (%v)", err)
 		}
 		return err

diff --git a/internal/auditd/sessiontracker.go b/internal/auditd/sessiontracker.go
@@ -53,7 +53,7 @@ type sessionTracker struct {
 
 func (o *sessionTracker) remoteLogin(rul common.RemoteUserLogin) error {
 	var debugLogger *zap.SugaredLogger
-	if logger.Level() == zap.DebugLevel {
+	if logger.Level().Enabled(zap.DebugLevel) {
 		debugLogger = logger.With("RemoteUserLogin", rul)
 		debugLogger.Debugln("new remote user login")
 	}
@@ -113,7 +113,7 @@ func (o *sessionTracker) auditdEvent(event *aucoalesce.Event) error {
 	}
 
 	var debugLogger *zap.SugaredLogger
-	if logger.Level() == zap.DebugLevel {
+	if logger.Level().Enabled(zap.DebugLevel) {
 		debugLogger = logger.With(
 			"auditEvent", *event,
 			"auditEventType", event.Type.String(),
@@ -242,7 +242,7 @@ func (o *sessionTracker) auditdEvent(event *aucoalesce.Event) error {
 
 func (o *sessionTracker) deleteUsersWithoutLoginsBefore(t time.Time) {
 	var debugLogger *zap.SugaredLogger
-	if logger.Level() == zap.DebugLevel {
+	if logger.Level().Enabled(zap.DebugLevel) {
 		debugLogger = logger.With(
 			"cacheCleanup", "deleteUsersWithoutLoginsBefore",
 			"before", t.String())
@@ -264,7 +264,7 @@ func (o *sessionTracker) deleteUsersWithoutLoginsBefore(t time.Time) {
 
 func (o *sessionTracker) deleteRemoteUserLoginsBefore(t time.Time) {
 	var debugLogger *zap.SugaredLogger
-	if logger.Level() == zap.DebugLevel {
+	if logger.Level().Enabled(zap.DebugLevel) {
 		debugLogger = logger.With(
 			"cacheCleanup", "deleteRemoteUserLoginsBefore",
 			"before", t.String())

diff --git a/internal/journald/processentry.go b/internal/journald/processentry.go
@@ -215,7 +215,7 @@ func processAcceptPublicKeyEntry(config *processEntryConfig) error {
 	}
 
 	var debugLogger *zap.SugaredLogger
-	if logger.Level() == zap.DebugLevel {
+	if logger.Level().Enabled(zap.DebugLevel) {
 		debugLogger = logger.With("eventPID", config.pid)
 		debugLogger.Debugln("writing event to auditevent writer...")
 	}