From 471e2f98d764da3da7f23fc9ed7e61bddcea045f Mon Sep 17 00:00:00 2001
From: "Theodor S. Midtlien" <theodor@midtlien.com>
Date: Wed, 20 May 2026 11:36:53 +0200
Subject: [PATCH] Refactor log disable check

---
 util/log.go | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/util/log.go b/util/log.go
index d6a9f632f..66d19f57a 100644
--- a/util/log.go
+++ b/util/log.go
@@ -60,15 +60,7 @@ func InitLogger(logger *log.Logger, logLevel string, logs ...string) error {
 		case "":
 			logger.Warnf("empty log path received: %#v", logPath)
 		default:
-			conflict, configPath := FindFirstLogrotateConflict()
-			if conflict {
-				logger.Warnf("log rotation conflict detected in: %#v, rotation is disabled", configPath)
-			}
-			rotationDisabled := isRotationDisabled()
-			if rotationDisabled {
-				logger.Warn("log rotation is disabled by env flag")
-			}
-			writer, err := setupLogFile(logPath, conflict || rotationDisabled)
+			writer, err := setupLogFile(logPath, isRotationDisabled(logger))
 			if err != nil {
 				logger.Errorf("failed setting up log file: %s, %s", logPath, err)
 				return err
@@ -108,13 +100,19 @@ func FindFirstLogPath(logs []string) string {
 	return ""
 }
 
-func isRotationDisabled() bool {
-	v, ok := os.LookupEnv("NB_LOG_DISABLE_ROTATION")
-	if !ok {
-		return false
-	}
+func isRotationDisabled(logger *log.Logger) bool {
+	v, _ := os.LookupEnv("NB_LOG_DISABLE_ROTATION")
 	disabled, _ := strconv.ParseBool(v)
-	return disabled
+	if disabled {
+		logger.Warnf("log rotation is disabled by env flag")
+		return true
+	}
+	conflict, configPath := FindFirstLogrotateConflict()
+	if conflict {
+		logger.Warnf("log rotation conflict detected in: %#v, rotation is disabled", configPath)
+		return true
+	}
+	return false
 }
 
 func setupLogFile(logPath string, disableRotation bool) (io.Writer, error) {