Move log level setting to Config

Author: kevinmcconnell

README.md

@@ -66,3 +66,4 @@ customize its behavior:
 | `HTTP_IDLE_TIMEOUT`   | The maximum time in seconds that a client can be idle before the connection is closed. | 60 |
 | `HTTP_READ_TIMEOUT`   | The maximum time in seconds that a client can take to send the request headers. | 30 |
 | `HTTP_WRITE_TIMEOUT`  | The maximum time in seconds during which the client must read the response.     | 30 |
+| `DEBUG`               | Set to `1` or `true` to enable debug logging.                                   | Disabled |

cmd/thrust/main.go

@@ -8,23 +8,19 @@ import (
 	"github.com/basecamp/thruster/internal"
 )
 
-func setLogger() {
-	level := slog.LevelInfo
-	if os.Getenv("DEBUG") != "" {
-		level = slog.LevelDebug
-	}
+func setLogger(level slog.Level) {
 	slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: level})))
 }
 
 func main() {
-	setLogger()
-
 	config, err := internal.NewConfig()
 	if err != nil {
 		fmt.Printf("ERROR: %s\n", err)
 		os.Exit(1)
 	}
 
+	setLogger(config.LogLevel)
+
 	service := internal.NewService(config)
 	os.Exit(service.Run())
 }

internal/config.go

@@ -2,6 +2,7 @@ package internal
 
 import (
 	"errors"
+	"log/slog"
 	"os"
 	"strconv"
 	"time"
@@ -25,6 +26,8 @@ const (
 	defaultHttpIdleTimeout  = 60 * time.Second
 	defaultHttpReadTimeout  = 30 * time.Second
 	defaultHttpWriteTimeout = 30 * time.Second
+
+	defaultLogLevel = slog.LevelInfo
 )
 
 type Config struct {
@@ -46,13 +49,20 @@ type Config struct {
 	HttpIdleTimeout  time.Duration
 	HttpReadTimeout  time.Duration
 	HttpWriteTimeout time.Duration
+
+	LogLevel slog.Level
 }
 
 func NewConfig() (*Config, error) {
 	if len(os.Args) < 2 {
 		return nil, errors.New("missing upstream command")
 	}
 
+	logLevel := defaultLogLevel
+	if getEnvBool("DEBUG", false) {
+		logLevel = slog.LevelDebug
+	}
+
 	return &Config{
 		TargetPort:      getEnvInt("TARGET_PORT", defaultTargetPort),
 		UpstreamCommand: os.Args[1],
@@ -72,6 +82,8 @@ func NewConfig() (*Config, error) {
 		HttpIdleTimeout:  getEnvDuration("HTTP_IDLE_TIMEOUT", defaultHttpIdleTimeout),
 		HttpReadTimeout:  getEnvDuration("HTTP_READ_TIMEOUT", defaultHttpReadTimeout),
 		HttpWriteTimeout: getEnvDuration("HTTP_WRITE_TIMEOUT", defaultHttpWriteTimeout),
+
+		LogLevel: logLevel,
 	}, nil
 }
 

internal/config_test.go

@@ -1,6 +1,7 @@
 package internal
 
 import (
+	"log/slog"
 	"testing"
 	"time"
 
@@ -17,6 +18,7 @@ func TestConfig_defaults(t *testing.T) {
 	assert.Equal(t, 3000, c.TargetPort)
 	assert.Equal(t, "echo", c.UpstreamCommand)
 	assert.Equal(t, defaultCacheSize, c.CacheSizeBytes)
+	assert.Equal(t, slog.LevelInfo, c.LogLevel)
 }
 
 func TestConfig_override_defaults_with_env_vars(t *testing.T) {
@@ -25,6 +27,7 @@ func TestConfig_override_defaults_with_env_vars(t *testing.T) {
 	usingEnvVar(t, "CACHE_SIZE", "256")
 	usingEnvVar(t, "HTTP_READ_TIMEOUT", "5")
 	usingEnvVar(t, "X_SENDFILE_ENABLED", "0")
+	usingEnvVar(t, "DEBUG", "1")
 
 	c, err := NewConfig()
 	require.NoError(t, err)
@@ -33,6 +36,7 @@ func TestConfig_override_defaults_with_env_vars(t *testing.T) {
 	assert.Equal(t, 256, c.CacheSizeBytes)
 	assert.Equal(t, 5*time.Second, c.HttpReadTimeout)
 	assert.Equal(t, false, c.XSendfileEnabled)
+	assert.Equal(t, slog.LevelDebug, c.LogLevel)
 }
 
 func TestConfig_return_error_when_no_upstream_command(t *testing.T) {