Merge pull request #145 from nicolasbock/refactor

Split logging and parsing
canonical · May 17, 2024 · a2538ba · a2538ba
2 parents a41b0ac + 9ff08ee
commit a2538ba
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/cmd/monitor/main.go b/cmd/monitor/main.go
@@ -25,6 +25,7 @@ var (
 )
 
 func init() {
+	common.ParseCommandline()
 	common.InitLogging(logLevel)
 }
 

diff --git a/cmd/processor/main.go b/cmd/processor/main.go
@@ -26,6 +26,7 @@ var (
 )
 
 func init() {
+	common.ParseCommandline()
 	common.InitLogging(logLevel)
 }
 

diff --git a/pkg/common/stringlist.go b/pkg/common/stringlist.go
@@ -2,10 +2,11 @@ package common
 
 import (
 	"fmt"
-	log "github.com/sirupsen/logrus"
-	"gopkg.in/alecthomas/kingpin.v2"
 	"os"
 	"strings"
+
+	log "github.com/sirupsen/logrus"
+	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 type stringList []string
@@ -35,10 +36,12 @@ func (f *AthenaFormatter) Format(entry *log.Entry) ([]byte, error) {
 	return []byte(fmt.Sprintf("%s [%s]: %s\n", entry.Time.Format("2006-01-02 15:04:05"), entry.Level.String(), entry.Message)), nil
 }
 
-func InitLogging(logLevel *string) {
+func ParseCommandline() {
 	kingpin.HelpFlag.Short('h')
 	kingpin.Parse()
+}
 
+func InitLogging(logLevel *string) {
 	// Log as JSON instead of the default ASCII formatter.
 	log.SetFormatter(&AthenaFormatter{})