all repos — searchix @ 99d5507b223baa6c780707d32c7bbbb8611034f0

Search engine for NixOS, nix-darwin, home-manager and NUR users

feat: allow configuration of log level

Alan Pearce
commit

99d5507b223baa6c780707d32c7bbbb8611034f0

parent

14c1ddaf7c5468c5966b0c1585f19a5ff39c206d

3 files changed, 15 insertions(+), 15 deletions(-)

jump to
M import/main.go → import/main.go
@@ -20,7 +20,8 @@
 const timeout = 30 * time.Minute
 
 type Config struct {
-	ConfigFile string `conf:"short:c"`
+	ConfigFile string     `conf:"short:c"`
+	LogLevel   slog.Level `conf:"default:INFO"`
 }
 
 func main() {

@@ -36,6 +37,7 @@ os.Exit(1)
 		}
 		log.Panicf("parsing runtime configuration: %v", err)
 	}
+	slog.SetLogLoggerLevel(runtimeConfig.LogLevel)
 
 	cfg, err := config.GetConfig(runtimeConfig.ConfigFile)
 	if err != nil {
M internal/server/server.go → internal/server/server.go
@@ -36,14 +36,15 @@ ShortSHA  string
 )
 
 type Config struct {
-	Production    bool    `conf:"default:false"`
-	InDevServer   bool    `conf:"default:false"`
-	LiveReload    bool    `conf:"default:false,flag:live"`
-	Root          string  `conf:"default:website"`
-	ListenAddress string  `conf:"default:localhost"`
-	Port          string  `conf:"default:3000,short:p"`
-	BaseURL       cfg.URL `conf:"default:http://localhost:3000,short:b"`
-	ConfigFile    string  `conf:"short:c"`
+	Production    bool       `conf:"default:false"`
+	InDevServer   bool       `conf:"default:false"`
+	LiveReload    bool       `conf:"default:false,flag:live"`
+	Root          string     `conf:"default:website"`
+	ListenAddress string     `conf:"default:localhost"`
+	Port          string     `conf:"default:3000,short:p"`
+	BaseURL       cfg.URL    `conf:"default:http://localhost:3000,short:b"`
+	ConfigFile    string     `conf:"short:c"`
+	LogLevel      slog.Level `conf:"default:INFO"`
 }
 
 type HTTPError struct {
M serve/main.go → serve/main.go
@@ -20,12 +20,6 @@ ShortSHA  string
 )
 
 func main() {
-	if os.Getenv("DEBUG") != "" {
-		slog.SetLogLoggerLevel(slog.LevelDebug)
-	}
-	log.SetFlags(log.LstdFlags | log.Lmsgprefix)
-	log.SetPrefix("searchix: ")
-
 	runtimeConfig := server.Config{}
 	help, err := conf.Parse("", &runtimeConfig)
 	if err != nil {

@@ -35,6 +29,9 @@ os.Exit(1)
 		}
 		log.Panicf("parsing runtime configuration: %v", err)
 	}
+	slog.SetLogLoggerLevel(runtimeConfig.LogLevel)
+	log.SetFlags(log.LstdFlags | log.Lmsgprefix)
+	log.SetPrefix("searchix: ")
 
 	c := make(chan os.Signal, 2)
 	signal.Notify(c, os.Interrupt)