feat: improved logging, can change level via LOG_LEVEL env var

cmd/minisql/main.go

@@ -12,6 +12,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/RichardKnop/minisql/internal/pkg/database"
+	"github.com/RichardKnop/minisql/internal/pkg/logging"
 	"github.com/RichardKnop/minisql/internal/pkg/minisql"
 	"github.com/RichardKnop/minisql/internal/pkg/pager"
 	"github.com/RichardKnop/minisql/internal/pkg/parser"
@@ -61,11 +62,26 @@ func doMetaCommand(inputBuffer string) metaCommand {
 func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 
-	logger, err := zap.NewDevelopment()
+	logConf := logging.DefaultConfig()
+
+	level := os.Getenv("LOG_LEVEL")
+	if level == "" {
+		level = "info"
+	}
+
+	l, err := logging.ParseLevel(level)
+	if err != nil {
+		panic(err)
+	}
+	logConf.Level = zap.NewAtomicLevelAt(l)
+
+	logger, err := logConf.Build()
 	if err != nil {
 		panic(err)
 	}
 
+	defer logger.Sync() // flushes buffer, if any
+
 	// TODO - hardcoded database for now
 	dbFile, err := os.OpenFile("db", os.O_RDWR|os.O_CREATE, 0600)
 	if err != nil {

internal/pkg/logging/logging.go

@@ -0,0 +1,46 @@
+package logging
+
+import (
+	"strconv"
+	"strings"
+
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+)
+
+func DefaultConfig() zap.Config {
+	logConf := zap.NewProductionConfig()
+	logConf.Sampling = nil
+	logConf.EncoderConfig.TimeKey = "time"
+	logConf.EncoderConfig.LevelKey = "severity"
+	logConf.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
+	logConf.EncoderConfig.EncodeLevel = zapcore.CapitalLevelEncoder
+
+	return logConf
+}
+
+func ParseLevel(l string) (zapcore.Level, error) {
+	l = strings.ToLower(strings.TrimSpace(l))
+	switch l {
+	case "debug":
+		return zapcore.DebugLevel, nil
+	case "info":
+		return zapcore.InfoLevel, nil
+	case "warn":
+		return zapcore.WarnLevel, nil
+	case "error":
+		return zapcore.ErrorLevel, nil
+	case "dpanic":
+		return zapcore.DPanicLevel, nil
+	case "panic":
+		return zapcore.PanicLevel, nil
+	case "fatal":
+		return zapcore.FatalLevel, nil
+	default:
+		level, err := strconv.ParseInt(l, 10, 8)
+		if err != nil {
+			return 0, err
+		}
+		return zapcore.Level(level), nil
+	}
+}

internal/pkg/minisql/minisql_test.go

@@ -2,10 +2,13 @@ package minisql
 
 import (
 	"bytes"
+	"os"
 	"time"
 
 	"github.com/brianvoe/gofakeit/v7"
 	"go.uber.org/zap"
+
+	"github.com/RichardKnop/minisql/internal/pkg/logging"
 )
 
 //go:generate mockery --name=Pager --structname=MockPager --inpackage --case=snake --testonly
@@ -58,8 +61,20 @@ var (
 )
 
 func init() {
-	var err error
-	testLogger, err = zap.NewDevelopment()
+	logConf := logging.DefaultConfig()
+
+	level := os.Getenv("LOG_LEVEL")
+	if level == "" {
+		level = "debug"
+	}
+
+	l, err := logging.ParseLevel(level)
+	if err != nil {
+		panic(err)
+	}
+	logConf.Level = zap.NewAtomicLevelAt(l)
+
+	testLogger, err = logConf.Build()
 	if err != nil {
 		panic(err)
 	}