Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-08 07:10:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

logger: don't print connection_id if empty

Browse Source 
Fixes #183
This commit is contained in:
Nicola Murino
2020-10-05 15:51:17 +02:00
parent f9827f958b
commit f1f7b81088
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
logger/logger.go
View File

@@ -94,36 +94,42 @@ func RotateLogFile() error {
// Log logs at the specified level for the specified sender // Log logs at the specified level for the specified sender
func Log(level LogLevel, sender string, connectionID string, format string, v ...interface{}) { func Log(level LogLevel, sender string, connectionID string, format string, v ...interface{}) {
var ev *zerolog.Event
switch level { switch level {
case LevelDebug: case LevelDebug:
Debug(sender, connectionID, format, v...) ev = logger.Debug()
case LevelInfo: case LevelInfo:
Info(sender, connectionID, format, v...) ev = logger.Info()
case LevelWarn: case LevelWarn:
Warn(sender, connectionID, format, v...) ev = logger.Warn()
default: default:
Error(sender, connectionID, format, v...) ev = logger.Error()
} }
ev.Timestamp().Str("sender", sender)
if connectionID != "" {
ev.Str("connection_id", connectionID)
}
ev.Msg(fmt.Sprintf(format, v...))
} }
// Debug logs at debug level for the specified sender // Debug logs at debug level for the specified sender
func Debug(sender string, connectionID string, format string, v ...interface{}) { func Debug(sender string, connectionID string, format string, v ...interface{}) {
logger.Debug().Timestamp().Str("sender", sender).Str("connection_id", connectionID).Msg(fmt.Sprintf(format, v...)) Log(LevelDebug, sender, connectionID, format, v...)
} }
// Info logs at info level for the specified sender // Info logs at info level for the specified sender
func Info(sender string, connectionID string, format string, v ...interface{}) { func Info(sender string, connectionID string, format string, v ...interface{}) {
logger.Info().Timestamp().Str("sender", sender).Str("connection_id", connectionID).Msg(fmt.Sprintf(format, v...)) Log(LevelInfo, sender, connectionID, format, v...)
} }
// Warn logs at warn level for the specified sender // Warn logs at warn level for the specified sender
func Warn(sender string, connectionID string, format string, v ...interface{}) { func Warn(sender string, connectionID string, format string, v ...interface{}) {
logger.Warn().Timestamp().Str("sender", sender).Str("connection_id", connectionID).Msg(fmt.Sprintf(format, v...)) Log(LevelWarn, sender, connectionID, format, v...)
} }
// Error logs at error level for the specified sender // Error logs at error level for the specified sender
func Error(sender string, connectionID string, format string, v ...interface{}) { func Error(sender string, connectionID string, format string, v ...interface{}) {
logger.Error().Timestamp().Str("sender", sender).Str("connection_id", connectionID).Msg(fmt.Sprintf(format, v...)) Log(LevelError, sender, connectionID, format, v...)
} }
// DebugToConsole logs at debug level to stdout // DebugToConsole logs at debug level to stdout