From 93f34c7d9e63957431f2681ba0b332a949229a4d Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <jan.treibig@gmail.com>
Date: Wed, 12 Apr 2023 12:27:15 +0200
Subject: [PATCH] Fix bug in tools related to log init

---
 tools/archive-manager/main.go   |  8 ++++++--
 tools/archive-migration/main.go | 10 +++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/tools/archive-manager/main.go b/tools/archive-manager/main.go
index 03b4e3a..34d66ac 100644
--- a/tools/archive-manager/main.go
+++ b/tools/archive-manager/main.go
@@ -8,20 +8,24 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"log"
 
 	"github.com/ClusterCockpit/cc-backend/internal/config"
 	"github.com/ClusterCockpit/cc-backend/pkg/archive"
+	"github.com/ClusterCockpit/cc-backend/pkg/log"
 )
 
 func main() {
-	var srcPath, flagConfigFile string
+	var srcPath, flagConfigFile, flagLogLevel string
+	var flagLogDateTime bool
 
 	flag.StringVar(&srcPath, "s", "./var/job-archive", "Specify the source job archive path. Default is ./var/job-archive")
+	flag.BoolVar(&flagLogDateTime, "logdate", false, "Set this flag to add date and time to log messages")
+	flag.StringVar(&flagLogLevel, "loglevel", "warn", "Sets the logging level: `[debug,info,warn (default),err,fatal,crit]`")
 	flag.StringVar(&flagConfigFile, "config", "./config.json", "Specify alternative path to `config.json`")
 	flag.Parse()
 	archiveCfg := fmt.Sprintf("{\"kind\": \"file\",\"path\": \"%s\"}", srcPath)
 
+	log.Init(flagLogLevel, flagLogDateTime)
 	config.Init(flagConfigFile)
 	config.Keys.Validate = true
 
diff --git a/tools/archive-migration/main.go b/tools/archive-migration/main.go
index fce3813..3e21ffa 100644
--- a/tools/archive-migration/main.go
+++ b/tools/archive-migration/main.go
@@ -10,11 +10,12 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"path/filepath"
 	"sync"
 
+	"github.com/ClusterCockpit/cc-backend/internal/config"
+	"github.com/ClusterCockpit/cc-backend/pkg/log"
 	"github.com/ClusterCockpit/cc-backend/pkg/schema"
 	"github.com/ClusterCockpit/cc-backend/pkg/units"
 )
@@ -218,9 +219,14 @@ func deepCopyClusterConfig(co *Cluster) schema.Cluster {
 }
 
 func main() {
+	var flagLogLevel, flagConfigFile string
+	var flagLogDateTime bool
 	var srcPath string
 	var dstPath string
 
+	flag.BoolVar(&flagLogDateTime, "logdate", false, "Set this flag to add date and time to log messages")
+	flag.StringVar(&flagLogLevel, "loglevel", "warn", "Sets the logging level: `[debug,info,warn (default),err,fatal,crit]`")
+	flag.StringVar(&flagConfigFile, "config", "./config.json", "Specify alternative path to `config.json`")
 	flag.StringVar(&srcPath, "s", "./var/job-archive", "Specify the source job archive path. Default is ./var/job-archive")
 	flag.StringVar(&dstPath, "d", "./var/job-archive-new", "Specify the destination job archive path. Default is ./var/job-archive-new")
 	flag.Parse()
@@ -229,6 +235,8 @@ func main() {
 		log.Fatal("Archive version exists!")
 	}
 
+	log.Init(flagLogLevel, flagLogDateTime)
+	config.Init(flagConfigFile)
 	srcConfig := fmt.Sprintf("{\"path\": \"%s\"}", srcPath)
 	err := ar.Init(json.RawMessage(srcConfig))
 	if err != nil {