diff --git a/cmd/crowdsec/main.go b/cmd/crowdsec/main.go index 767097f0e..0967c7920 100644 --- a/cmd/crowdsec/main.go +++ b/cmd/crowdsec/main.go @@ -52,11 +52,14 @@ var ( type Flags struct { ConfigFile string - TraceLevel bool - DebugLevel bool - InfoLevel bool - WarnLevel bool - ErrorLevel bool + + LogLevelTrace bool + LogLevelDebug bool + LogLevelInfo bool + LogLevelWarn bool + LogLevelError bool + LogLevelFatal bool + PrintVersion bool SingleFileType string Labels map[string]string @@ -140,11 +143,14 @@ func (l labelsMap) Set(label string) error { func (f *Flags) Parse() { flag.StringVar(&f.ConfigFile, "c", csconfig.DefaultConfigPath("config.yaml"), "configuration file") - flag.BoolVar(&f.TraceLevel, "trace", false, "VERY verbose") - flag.BoolVar(&f.DebugLevel, "debug", false, "print debug-level on stderr") - flag.BoolVar(&f.InfoLevel, "info", false, "print info-level on stderr") - flag.BoolVar(&f.WarnLevel, "warning", false, "print warning-level on stderr") - flag.BoolVar(&f.ErrorLevel, "error", false, "print error-level on stderr") + + flag.BoolVar(&f.LogLevelTrace, "trace", false, "set log level to 'trace' (VERY verbose)") + flag.BoolVar(&f.LogLevelDebug, "debug", false, "set log level to 'debug'") + flag.BoolVar(&f.LogLevelInfo, "info", false, "set log level to 'info'") + flag.BoolVar(&f.LogLevelWarn, "warning", false, "set log level to 'warning'") + flag.BoolVar(&f.LogLevelError, "error", false, "set log level to 'error'") + flag.BoolVar(&f.LogLevelFatal, "fatal", false, "set log level to 'fatal'") + flag.BoolVar(&f.PrintVersion, "version", false, "display version") flag.StringVar(&f.OneShotDSN, "dsn", "", "Process a single data source in time-machine") flag.StringVar(&f.Transform, "transform", "", "expr to apply on the event after acquisition") @@ -172,16 +178,18 @@ func newLogLevel(curLevelPtr *log.Level, f *Flags) *log.Level { // override from flags switch { - case f.TraceLevel: + case f.LogLevelTrace: ret = log.TraceLevel - case f.DebugLevel: + case f.LogLevelDebug: ret = log.DebugLevel - case f.InfoLevel: + case f.LogLevelInfo: ret = log.InfoLevel - case f.WarnLevel: + case f.LogLevelWarn: ret = log.WarnLevel - case f.ErrorLevel: + case f.LogLevelError: ret = log.ErrorLevel + case f.LogLevelFatal: + ret = log.FatalLevel default: }