From d134f4c8269bf9fe5130af33918b1ad7b079d1b6 Mon Sep 17 00:00:00 2001
From: Allen Porter <allen@thebends.org>
Date: Mon, 21 Feb 2022 12:57:59 -0800
Subject: [PATCH] Ensure config is persisted respecting command line flag

Update the SaveConfig to verify the --config command line flag is checked when
writing the save file. Simplify the command line flag variable handling.
---
 storageConfig.go | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/storageConfig.go b/storageConfig.go
index ecf8c40..0afbfe3 100644
--- a/storageConfig.go
+++ b/storageConfig.go
@@ -16,17 +16,18 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-//debug global
+// Command line flag global variables
 var debug bool
+var configFile string
 
 //NewStreamCore do load config file
 func NewStreamCore() *StorageST {
-	argConfigPatch := flag.String("config", "config.json", "config patch (/etc/server/config.json or config.json)")
-	argDebug := flag.Bool("debug", true, "set debug mode")
-	debug = *argDebug
+	flag.BoolVar(&debug, "debug", true, "set debug mode")
+	flag.StringVar(&configFile, "config", "config.json", "config patch (/etc/server/config.json or config.json)")
 	flag.Parse()
+
 	var tmp StorageST
-	data, err := ioutil.ReadFile(*argConfigPatch)
+	data, err := ioutil.ReadFile(configFile)
 	if err != nil {
 		log.WithFields(logrus.Fields{
 			"module": "config",
@@ -70,6 +71,10 @@ func NewStreamCore() *StorageST {
 
 //ClientDelete Delete Client
 func (obj *StorageST) SaveConfig() error {
+	log.WithFields(logrus.Fields{
+		"module": "config",
+		"func":   "NewStreamCore",
+	}).Debugln("Saving configuration to", configFile)
 	v2, err := version.NewVersion("2.0.0")
 	if err != nil {
 		return err
@@ -85,8 +90,13 @@ func (obj *StorageST) SaveConfig() error {
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile("config.json", res, 0644)
+	err = ioutil.WriteFile(configFile, res, 0644)
 	if err != nil {
+		log.WithFields(logrus.Fields{
+			"module": "config",
+			"func":   "SaveConfig",
+			"call":   "WriteFile",
+		}).Errorln(err.Error())
 		return err
 	}
 	return nil