Use toml conf format. Set debug printouts via config file or flag

Author: zluudg

cmd/observation-encoder/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"encoding/json"
 	"flag"
 	"fmt"
 	"os"
@@ -11,21 +10,23 @@ import (
 	"syscall"
 	"time"
 
+	//"github.com/nats-io/nats.go"
+	"github.com/pelletier/go-toml/v2"
+
 	"github.com/dnstapir/observation-encoder/internal/api"
 	"github.com/dnstapir/observation-encoder/internal/app"
 	"github.com/dnstapir/observation-encoder/internal/cert"
 	"github.com/dnstapir/observation-encoder/internal/common"
 	"github.com/dnstapir/observation-encoder/internal/logger"
 )
 
-/* Rewritten if building with make */
-var version = "BAD-BUILD"
 var commit = "BAD-BUILD"
 
 type conf struct {
 	app.Conf
-	Api  api.Conf
-	Cert cert.Conf `json:"cert"`
+	Debug bool      `toml:"debug"`
+	Api   api.Conf  `toml:"api"`
+	Cert  cert.Conf `toml:"cert"`
 }
 
 func main() {
@@ -41,7 +42,7 @@ func main() {
 	)
 	flag.StringVar(&configFile,
 		"config",
-		"",
+		"config.toml",
 		"Configuration file to use",
 	)
 	flag.BoolVar(&debugFlag,
@@ -59,13 +60,11 @@ func main() {
 		panic(fmt.Sprintf("Could not create logger, err: '%s'", err))
 	}
 
-	log.Info("observation-encoder version: '%s', commit: '%s'", version, commit)
+	log.Info("observation-encoder, commit: '%s'", commit)
 	if runVersionCmd {
 		os.Exit(0)
 	}
 
-	log.Debug("Debug logging enabled")
-
 	if configFile == "" {
 		log.Error("No config file specified, exiting...")
 		os.Exit(-1)
@@ -78,7 +77,7 @@ func main() {
 	}
 	defer file.Close()
 
-	confDecoder := json.NewDecoder(file)
+	confDecoder := toml.NewDecoder(file)
 	if confDecoder == nil {
 		log.Error("Problem decoding config file '%s', exiting...", configFile)
 		os.Exit(-1)
@@ -88,21 +87,32 @@ func main() {
 	confDecoder.Decode(&mainConf)
 	file.Close() // TODO okay to close here while also using defer above?
 
-	mainConf.Log = log
+	// TODO create different loggers with different debug settings
+	applog, err := logger.Create(
+		logger.Conf{
+			Debug: debugFlag || mainConf.Debug,
+		})
+	if err != nil {
+		log.Error("Error creating app log: %s", err)
+	} else {
+		applog.Debug("Debug logging enabled")
+	}
+
+	mainConf.Log = applog
 	appHandle, err := app.Create(mainConf.Conf)
 	if err != nil {
 		log.Error("Error creating application: '%s'", err)
 		os.Exit(-1)
 	}
 
-	mainConf.Cert.Log = log
+	mainConf.Cert.Log = applog
 	certHandle, err := cert.Create(mainConf.Cert)
 	if err != nil {
 		log.Error("Error creating cert manager: '%s'", err)
 		os.Exit(-1)
 	}
 
-	mainConf.Api.Log = log
+	mainConf.Api.Log = applog
 	mainConf.Api.App = appHandle
 	mainConf.Api.Certs = certHandle
 	apiHandle, err := api.Create(mainConf.Api)
@@ -119,11 +129,15 @@ func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 	exitCh := make(chan common.Exit)
 
+	log.Info("Starting threads...")
+
 	go appHandle.Run(ctx, exitCh)
 
 	go apiHandle.Run(ctx, exitCh)
 	go certHandle.Run(ctx, exitCh)
 
+	log.Info("Threads started!")
+
 	exitLoop := false
 	var wg sync.WaitGroup
 	wg.Add(1)

go.mod

@@ -1,3 +1,5 @@
 module github.com/dnstapir/observation-encoder
 
 go 1.24.6
+
+require github.com/pelletier/go-toml/v2 v2.2.4

go.sum

@@ -0,0 +1,2 @@
+github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
+github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=

internal/api/api.go

@@ -14,9 +14,9 @@ import (
 )
 
 type Conf struct {
-	Active  bool   `json:"active"`
-	Address string `json:"address"`
-	Port    string `json:"port"`
+	Active  bool   `toml:"active"`
+	Address string `toml:"address"`
+	Port    string `toml:"port"`
 	Log     common.Logger
 	App     appHandle
 	Certs   certHandle

internal/app/app.go

@@ -13,8 +13,8 @@ const c_N_HANDLERS = 3
 
 type Conf struct {
 	Log     common.Logger
-	Address string `json:"address"`
-	Port    string `json:"port"`
+	Address string `toml:"address"`
+	Port    string `toml:"port"`
 }
 
 type appHandle struct {

internal/cert/cert.go

@@ -17,8 +17,8 @@ import (
 
 type Conf struct {
 	Log      common.Logger
-	Interval int    `json:"interval"`
-	CertDir  string `json:"cert_dir"`
+	Interval int    `toml:"interval"`
+	CertDir  string `toml:"cert_dir"`
 }
 
 type certHandle struct {