From ef0aebe3f69611d22e6b4a4c8f0216fb1697c76f Mon Sep 17 00:00:00 2001 From: Mikhail Avramenko Date: Thu, 7 Oct 2021 19:30:57 +0700 Subject: [PATCH 1/2] Added config option for log level Signed-off-by: Mikhail Avramenko --- main.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/main.go b/main.go index b9bf5c9..9acce9f 100644 --- a/main.go +++ b/main.go @@ -86,6 +86,7 @@ type Config struct { Labels map[string]string `default:"" desc:"Endpoint labels"` ACLConfigPath string `default:"/etc/vppagent-firewall/config.yaml" desc:"Path to ACL config file" split_words:"true"` ACLConfig []acl_types.ACLRule `default:"" desc:"configured acl rules"` + LogLevel string `default:"INFO" desc:"Log level" split_words:"true"` } // Process prints and processes env to config @@ -140,6 +141,7 @@ func main() { if err := config.Process(); err != nil { logrus.Fatal(err.Error()) } + setLogLevel(config.LogLevel) config.retrieveACLRules(ctx) @@ -326,3 +328,11 @@ func (c *Config) retrieveACLRules(ctx context.Context) { logger.Infof("Result rules:%v", c.ACLConfig) } + +func setLogLevel(level string) { + l, err := logrus.ParseLevel(level) + if err != nil { + logrus.Fatalf("invalid log level %s", level) + } + logrus.SetLevel(l) +} From 41f9275bbd1ed88871c59db76880accb9908bb47 Mon Sep 17 00:00:00 2001 From: Mikhail Avramenko Date: Mon, 11 Oct 2021 10:15:12 +0700 Subject: [PATCH 2/2] review fixes Signed-off-by: Mikhail Avramenko --- .golangci.yml | 2 +- main.go | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index ae4fb9e..7c00ea2 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -35,7 +35,7 @@ linters-settings: dupl: threshold: 150 funlen: - Lines: 175 + Lines: 180 Statements: 75 goconst: min-len: 2 diff --git a/main.go b/main.go index 9acce9f..8e3db8d 100644 --- a/main.go +++ b/main.go @@ -141,7 +141,11 @@ func main() { if err := config.Process(); err != nil { logrus.Fatal(err.Error()) } - setLogLevel(config.LogLevel) + l, err := logrus.ParseLevel(config.LogLevel) + if err != nil { + logrus.Fatalf("invalid log level %s", config.LogLevel) + } + logrus.SetLevel(l) config.retrieveACLRules(ctx) @@ -328,11 +332,3 @@ func (c *Config) retrieveACLRules(ctx context.Context) { logger.Infof("Result rules:%v", c.ACLConfig) } - -func setLogLevel(level string) { - l, err := logrus.ParseLevel(level) - if err != nil { - logrus.Fatalf("invalid log level %s", level) - } - logrus.SetLevel(l) -}