From 4c8ef726faac7fd4eed477f5bdd1f7f1a2cfad77 Mon Sep 17 00:00:00 2001
From: Cyrille Nofficial <cynoffic@cyrilix.fr>
Date: Mon, 3 Jan 2022 18:03:17 +0100
Subject: [PATCH] refactor(cli): rewrite log configuration

---
 cmd/rc-steering/rc-steering.go | 10 ++++------
 pkg/part/part.go               |  5 ++---
 pkg/part/part_test.go          |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/cmd/rc-steering/rc-steering.go b/cmd/rc-steering/rc-steering.go
index 7c6cbb0..55a2d82 100644
--- a/cmd/rc-steering/rc-steering.go
+++ b/cmd/rc-steering/rc-steering.go
@@ -28,20 +28,17 @@ func main() {
 	flag.StringVar(&tfSteeringTopic, "mqtt-topic-tf-steering", os.Getenv("MQTT_TOPIC_TF_STEERING"), "Mqtt topic that contains tenorflow steering value, use MQTT_TOPIC_TF_STEERING if args not set")
 	flag.StringVar(&driveModeTopic, "mqtt-topic-drive-mode", os.Getenv("MQTT_TOPIC_DRIVE_MODE"), "Mqtt topic that contains DriveMode value, use MQTT_TOPIC_DRIVE_MODE if args not set")
 
-	flag.BoolVar(&debug, "debug", false, "Display raw value to debug")
+	logLevel := zap.LevelFlag("log", zap.InfoLevel, "log level")
 
 	flag.Parse()
+
 	if len(os.Args) <= 1 {
 		flag.PrintDefaults()
 		os.Exit(1)
 	}
 
 	config := zap.NewDevelopmentConfig()
-	if debug {
-		config.Level = zap.NewAtomicLevelAt(zap.DebugLevel)
-	} else {
-		config.Level = zap.NewAtomicLevelAt(zap.InfoLevel)
-	}
+	config.Level = zap.NewAtomicLevelAt(*logLevel)
 	lgr, err := config.Build()
 	if err != nil {
 		log.Fatalf("unable to init logger: %v", err)
@@ -53,6 +50,7 @@ func main() {
 	}()
 	zap.ReplaceGlobals(lgr)
 
+	debug = logLevel.Enabled(zap.DebugLevel)
 	client, err := cli.Connect(mqttBroker, username, password, clientId)
 	if err != nil {
 		log.Fatalf("unable to connect to mqtt bus: %v", err)
diff --git a/pkg/part/part.go b/pkg/part/part.go
index 0bbbe20..c70f352 100644
--- a/pkg/part/part.go
+++ b/pkg/part/part.go
@@ -17,7 +17,6 @@ func NewPart(client mqtt.Client, steeringTopic, driveModeTopic, rcSteeringTopic,
 		rcSteeringTopic: rcSteeringTopic,
 		tfSteeringTopic: tfSteeringTopic,
 		driveMode:       events.DriveMode_USER,
-		debug:           debug,
 	}
 
 }
@@ -72,7 +71,7 @@ func (p *SteeringPart) onRCSteering(_ mqtt.Client, message mqtt.Message) {
 		err := proto.Unmarshal(message.Payload(), &evt)
 		if err != nil {
 			zap.S().Debugf("unable to unmarshal rc event: %v", err)
-		}else {
+		} else {
 			zap.S().Debugf("receive steering message from radio command: %0.00f", evt.GetSteering())
 		}
 	}
@@ -90,7 +89,7 @@ func (p *SteeringPart) onTFSteering(_ mqtt.Client, message mqtt.Message) {
 		err := proto.Unmarshal(message.Payload(), &evt)
 		if err != nil {
 			zap.S().Debugf("unable to unmarshal tensorflow event: %v", err)
-		}else {
+		} else {
 			zap.S().Debugf("receive steering message from tensorflow: %0.00f", evt.GetSteering())
 		}
 	}
diff --git a/pkg/part/part_test.go b/pkg/part/part_test.go
index fa3e455..744bd31 100644
--- a/pkg/part/part_test.go
+++ b/pkg/part/part_test.go
@@ -34,7 +34,7 @@ func TestDefaultSteering(t *testing.T) {
 	rcSteeringTopic := "topic/rcSteering"
 	tfSteeringTopic := "topic/tfSteering"
 
-	p := NewPart(nil, steeringTopic, driveModeTopic, rcSteeringTopic, tfSteeringTopic)
+	p := NewPart(nil, steeringTopic, driveModeTopic, rcSteeringTopic, tfSteeringTopic, true)
 
 	cases := []struct {
 		driveMode        events.DriveModeMessage