0ct0pu5/crowdsec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

simplify the code

Browse source
This commit is contained in:
Thibault bui Koechlin 2020-05-27 12:37:18 +02:00
parent 1591d1b8e3
commit 0529a256bb
1 changed files with 21 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
pkg/types/utils.go
View file

@ -3,6 +3,7 @@ package types
import ( import (
"encoding/binary" "encoding/binary"
"fmt" "fmt"
"io"
"net" "net"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
@ -45,34 +46,34 @@ func LastAddress(n *net.IPNet) net.IP {
ip[3]|^n.Mask[3]) ip[3]|^n.Mask[3])
} }
var logMode string var logFormatter log.Formatter
var logFolder string var logOutput io.Writer
var logLevel log.Level var logLevel log.Level
var logReportCaller bool
func SetDefaultLoggerConfig(inlogMode string, inlogFolder string, inlogLevel log.Level) error { func SetDefaultLoggerConfig(cfgMode string, cfgFolder string, cfgLevel log.Level) error {
logMode = inlogMode
logFolder = inlogFolder
logLevel = inlogLevel
/*Configure logs*/ /*Configure logs*/
if logMode == "file" { if cfgMode == "file" {
log.SetOutput(&lumberjack.Logger{ logOutput = &lumberjack.Logger{
Filename: logFolder + "/crowdsec.log", Filename: cfgFolder + "/crowdsec.log",
MaxSize: 500, //megabytes MaxSize: 500, //megabytes
MaxBackups: 3, MaxBackups: 3,
MaxAge: 28, //days MaxAge: 28, //days
Compress: true, //disabled by default Compress: true, //disabled by default
}) }
log.SetFormatter(&log.TextFormatter{TimestampFormat: "02-01-2006 15:04:05", FullTimestamp: true}) log.SetOutput(logOutput)
} else if logMode != "stdout" { } else if cfgMode != "stdout" {
return fmt.Errorf("log mode '%s' unknown", logMode) return fmt.Errorf("log mode '%s' unknown", cfgMode)
} }
logLevel = cfgLevel
log.SetLevel(logLevel) log.SetLevel(logLevel)
log.SetFormatter(&log.TextFormatter{FullTimestamp: true})
if logLevel >= log.InfoLevel { if logLevel >= log.InfoLevel {
log.SetFormatter(&log.TextFormatter{TimestampFormat: "02-01-2006 15:04:05", FullTimestamp: true}) logFormatter = &log.TextFormatter{TimestampFormat: "02-01-2006 15:04:05", FullTimestamp: true}
log.SetFormatter(logFormatter)
} }
if logLevel >= log.DebugLevel { if logLevel >= log.DebugLevel {
logReportCaller = true
log.SetReportCaller(true) log.SetReportCaller(true)
} }
return nil return nil
@ -80,25 +81,13 @@ func SetDefaultLoggerConfig(inlogMode string, inlogFolder string, inlogLevel log
func ConfigureLogger(clog *log.Logger) error { func ConfigureLogger(clog *log.Logger) error {
/*Configure logs*/ /*Configure logs*/
if logMode == "file" { if logOutput != nil {
clog.SetOutput(&lumberjack.Logger{ clog.SetOutput(logOutput)
Filename: logFolder + "/crowdsec.log",
MaxSize: 500, //megabytes
MaxBackups: 3,
MaxAge: 28, //days
Compress: true, //disabled by default
})
clog.SetFormatter(&log.TextFormatter{TimestampFormat: "02-01-2006 15:04:05", FullTimestamp: true})
} else if logMode != "stdout" {
return fmt.Errorf("log mode '%s' unknown", logMode)
} }
clog.SetLevel(logLevel) if logReportCaller {
clog.SetFormatter(&log.TextFormatter{FullTimestamp: true})
if logLevel >= log.InfoLevel {
clog.SetFormatter(&log.TextFormatter{TimestampFormat: "02-01-2006 15:04:05", FullTimestamp: true})
}
if logLevel >= log.DebugLevel {
clog.SetReportCaller(true) clog.SetReportCaller(true)
} }
clog.SetFormatter(logFormatter)
clog.SetLevel(logLevel)
return nil return nil
} }