Base logging functionality complete

Author: brokenCursor

config/config.go

@@ -0,0 +1,45 @@
+package config
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/viper"
+)
+
+var config *viper.Viper
+
+func init() {
+	// Get config path
+	dir, err := os.UserConfigDir()
+	if err != nil {
+		panic("failed to get user config dir")
+	}
+
+	// Setup configuration
+	config = viper.New()
+	config.SetConfigName("config")
+	config.SetConfigType("yaml")
+
+	sep := string(os.PathSeparator)
+	config.AddConfigPath(dir + sep + "modem-cli")
+
+	// -- Defaults -- //
+	config.SetDefault("modem.model", "dummy")
+	config.SetDefault("modem.host", "127.0.0.1")
+
+	config.SetDefault("logging.general", "error")
+	config.SetDefault("logging.driver", "error")
+
+	config.SetDefault("driver.cmd_ttl", 10)
+	// -- Defaults -- //
+
+	err = config.ReadInConfig()
+	if err != nil { // Handle errors reading the config file
+		panic(fmt.Errorf("fatal error config file: %w", err))
+	}
+}
+
+func Sub(name string) *viper.Viper {
+	return config.Sub(name)
+}

drivers/8810ft.go

@@ -4,12 +4,14 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log/slog"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/brokenCursor/usb-modem-cli/logging"
 	"github.com/warthog618/sms/encoding/gsm7"
 )
 
@@ -29,11 +31,16 @@ type (
 	}
 )
 
-var httpClient *http.Client
+var (
+	httpClient *http.Client
+	l          *slog.Logger
+)
 
 func init() {
+	l = logging.GetDriverLogger("ZTE 8810FT")
 	httpClient = &http.Client{Timeout: time.Second * 30}
 	registerDriver("ZTE 8810FT", newZTE8810FT)
+	l.Debug("driver registered")
 }
 
 func newZTE8810FT(host string) BaseModem {

drivers/common.go

@@ -1,6 +1,11 @@
 package drivers
 
-import "fmt"
+import (
+	"fmt"
+	"log/slog"
+
+	"github.com/brokenCursor/usb-modem-cli/logging"
+)
 
 // Modem interfaces
 
@@ -42,7 +47,14 @@ type (
 	}
 )
 
-var drivers map[string]func(host string) BaseModem = map[string]func(host string) BaseModem{}
+var (
+	drivers map[string]func(host string) BaseModem = map[string]func(host string) BaseModem{}
+	logger  *slog.Logger
+)
+
+func init() {
+	logger = logging.GetGeneralLogger()
+}
 
 func isRegistered(name string) bool {
 	// Check if driver has already been registered
@@ -65,6 +77,7 @@ func GetModemDriver(model string, host string) (BaseModem, error) {
 		return nil, ErrUnknownModel
 	}
 
+	logger.Debug("driver instance created", "driver", model, "host", host)
 	return drivers[model](host), nil
 }
 

logging/logging.go

@@ -0,0 +1,69 @@
+package logging
+
+import (
+	"fmt"
+	"log/slog"
+	"os"
+
+	"github.com/brokenCursor/usb-modem-cli/config"
+)
+
+var (
+	general *slog.Logger
+	driver  *slog.Logger
+)
+
+func init() {
+	logConfig := config.Sub("logging")
+	// Setup levels
+	generalLevel, err := strToLevel(logConfig.GetString("general"))
+	if err != nil {
+		slog.Error("logging.general: ", err.Error(), nil)
+	}
+
+	// Setup levels
+	driverLevel, err := strToLevel(logConfig.GetString("driver"))
+	if err != nil {
+		slog.Error("logging.driver: ", err.Error(), nil)
+	}
+
+	// Setup loggers
+	general = slog.New(slog.NewTextHandler(os.Stdout,
+		&slog.HandlerOptions{
+			Level:     generalLevel,
+			AddSource: false,
+		}))
+
+	driver = slog.New(slog.NewTextHandler(os.Stdout,
+		&slog.HandlerOptions{
+			Level:     driverLevel,
+			AddSource: true,
+		}))
+
+	general.Debug("logging setup done")
+}
+
+func strToLevel(level string) (res slog.Level, err error) {
+	switch level {
+	case "debug":
+		res = slog.LevelDebug
+	case "info":
+		res = slog.LevelInfo
+	case "warn":
+		res = slog.LevelWarn
+	case "error":
+		res = slog.LevelError
+	default:
+		return slog.LevelInfo, fmt.Errorf("no %s logging level", level)
+	}
+
+	return res, nil
+}
+
+func GetGeneralLogger() *slog.Logger {
+	return general
+}
+
+func GetDriverLogger(name string) *slog.Logger {
+	return driver.With("driver", name)
+}

mcli.go

@@ -1,47 +1,27 @@
 package main
 
 import (
-	"fmt"
+	"log/slog"
 	"os"
 
 	"github.com/alexflint/go-arg"
+	"github.com/brokenCursor/usb-modem-cli/config"
 	"github.com/brokenCursor/usb-modem-cli/drivers"
+	"github.com/brokenCursor/usb-modem-cli/logging"
 	"github.com/go-playground/validator/v10"
 	"github.com/i582/cfmt/cmd/cfmt"
-	"github.com/spf13/viper"
 )
 
 var (
 	validate *validator.Validate
 	args     BaseArgs
-	config   *viper.Viper
+	logger   *slog.Logger
 )
 
 func init() {
 	// Create a single instance of validator
 	validate = validator.New(validator.WithRequiredStructEnabled())
-
-	// Get config path
-	dir, err := os.UserConfigDir()
-	if err != nil {
-		panic("failed to get user config dir")
-	}
-
-	// Setup configuration
-	config = viper.New()
-	config.SetConfigName("config")
-	config.SetConfigType("yaml")
-
-	sep := string(os.PathSeparator)
-	config.AddConfigPath(dir + sep + "modem-cli")
-
-	config.SetDefault("modem.model", "dummy")
-	config.SetDefault("modem.host", "127.0.0.1")
-
-	err = config.ReadInConfig()
-	if err != nil { // Handle errors reading the config file
-		panic(fmt.Errorf("fatal error config file: %w", err))
-	}
+	logger = logging.GetGeneralLogger()
 }
 
 func main() {
@@ -65,11 +45,13 @@ func run() error {
 	}
 
 	if args.DisableColor {
+		logger.Debug("Colored output disabled")
 		cfmt.DisableColors()
 	}
 
 	// If IP has been overridden
 	if len(args.Host) > 0 {
+		logger.Debug("IP has been overridden")
 		ip = args.Host
 	}
 
@@ -93,19 +75,16 @@ func run() error {
 		switch args.Connection.Action {
 		case "up":
 			err := cell.ConnectCell()
-
 			if err != nil {
 				return err
 			}
 		case "down":
 			err := cell.DisconnectCell()
-
 			if err != nil {
 				return err
 			}
 		case "status":
 			status, err := cell.GetCellConnStatus()
-
 			if err != nil {
 				return err
 			}