Skip to content

Commit

Permalink
Add a function for enabling sys logs (#8215)
Browse files Browse the repository at this point in the history
  • Loading branch information
idanovo authored Sep 25, 2024
1 parent b620bf7 commit 6df9265
Showing 1 changed file with 37 additions and 0 deletions.
37 changes: 37 additions & 0 deletions pkg/logging/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"io"
"log/syslog"
"os"
"reflect"
"runtime"
Expand All @@ -13,6 +14,7 @@ import (
"time"

"github.com/sirupsen/logrus"
lSyslog "github.com/sirupsen/logrus/hooks/syslog"
"gopkg.in/natefinch/lumberjack.v2"
)

Expand Down Expand Up @@ -65,6 +67,7 @@ var (
formatterInitOnce sync.Once
defaultLogger = logrus.New()
openLoggers []io.Closer
syslogOnce sync.Once
)

func Level() string {
Expand Down Expand Up @@ -394,6 +397,40 @@ 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)
Expand Down

0 comments on commit 6df9265

Please sign in to comment.