Changed syslogs function to build only for non-windows OS (#8248)

treeverse · Sep 30, 2024 · e428977 · e428977
1 parent c9ab2a8
commit e428977
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 36 deletions.
diff --git a/pkg/logging/logger.go b/pkg/logging/logger.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"log/syslog"
 	"os"
 	"reflect"
 	"runtime"
@@ -14,7 +13,6 @@ import (
 	"time"
 
 	"github.com/sirupsen/logrus"
-	lSyslog "github.com/sirupsen/logrus/hooks/syslog"
 	"gopkg.in/natefinch/lumberjack.v2"
 )
 
@@ -397,40 +395,6 @@ func ContextUnavailable() Logger {
 	}
 }
 
-func ContextUnavailableWithSysLogs(sysLogsLevel string) Logger {
-	// wrap formatter with our own formatter that overrides caller
-	formatterInitOnce.Do(func() {
-		defaultLogger.SetReportCaller(true)
-		defaultLogger.SetNoLock()
-		defaultLogger.Formatter = logrusCallerFormatter{defaultLogger.Formatter}
-	})
-	syslogOnce.Do(func() {
-		var hook *lSyslog.SyslogHook
-		var err error
-		switch strings.ToLower(sysLogsLevel) {
-		// There's no syslog level for trace, using debug instead.
-		case "trace", "debug":
-			hook, err = lSyslog.NewSyslogHook("", "", syslog.LOG_DEBUG, "")
-		case "info":
-			hook, err = lSyslog.NewSyslogHook("", "", syslog.LOG_INFO, "")
-		case "warn", "warning":
-			hook, err = lSyslog.NewSyslogHook("", "", syslog.LOG_WARNING, "")
-		case "error":
-			hook, err = lSyslog.NewSyslogHook("", "", syslog.LOG_ERR, "")
-		case "panic", "null", "none":
-			hook, err = lSyslog.NewSyslogHook("", "", syslog.LOG_CRIT, "")
-		}
-		if err != nil {
-			defaultLogger.WithError(err).Error("failed to set syslog hook")
-		} else {
-			defaultLogger.AddHook(hook)
-		}
-	})
-	return &logrusEntryWrapper{
-		e: logrus.NewEntry(defaultLogger),
-	}
-}
-
 // GetFieldsFromContext returns the logging fields on ctx or nil.
 func GetFieldsFromContext(ctx context.Context) Fields {
 	fields := ctx.Value(LogFieldsContextKey)

diff --git a/pkg/logging/syslogs.go b/pkg/logging/syslogs.go
@@ -0,0 +1,45 @@
+//go:build !windows
+
+package logging
+
+import (
+	"log/syslog"
+	"strings"
+
+	"github.com/sirupsen/logrus"
+	lSyslog "github.com/sirupsen/logrus/hooks/syslog"
+)
+
+func ContextUnavailableWithSysLogs(sysLogsLevel string) Logger {
+	// wrap formatter with our own formatter that overrides caller
+	formatterInitOnce.Do(func() {
+		defaultLogger.SetReportCaller(true)
+		defaultLogger.SetNoLock()
+		defaultLogger.Formatter = logrusCallerFormatter{defaultLogger.Formatter}
+	})
+	syslogOnce.Do(func() {
+		var hook *lSyslog.SyslogHook
+		var err error
+		switch strings.ToLower(sysLogsLevel) {
+		// There's no syslog level for trace, using debug instead.
+		case "trace", "debug":
+			hook, err = lSyslog.NewSyslogHook("", "", syslog.LOG_DEBUG, "")
+		case "info":
+			hook, err = lSyslog.NewSyslogHook("", "", syslog.LOG_INFO, "")
+		case "warn", "warning":
+			hook, err = lSyslog.NewSyslogHook("", "", syslog.LOG_WARNING, "")
+		case "error":
+			hook, err = lSyslog.NewSyslogHook("", "", syslog.LOG_ERR, "")
+		case "panic", "null", "none":
+			hook, err = lSyslog.NewSyslogHook("", "", syslog.LOG_CRIT, "")
+		}
+		if err != nil {
+			defaultLogger.WithError(err).Error("failed to set syslog hook")
+		} else {
+			defaultLogger.AddHook(hook)
+		}
+	})
+	return &logrusEntryWrapper{
+		e: logrus.NewEntry(defaultLogger),
+	}
+}