refactor: migrates to log/slog

Author: nxtcoder17

pkg/executor/cmd-executor.go

@@ -2,13 +2,12 @@ package executor
 
 import (
 	"context"
+	"log/slog"
 	"os"
 	"os/exec"
 	"strings"
 	"sync"
 	"syscall"
-
-	"github.com/nxtcoder17/go.pkgs/log"
 )
 
 type CommandGroup struct {
@@ -20,7 +19,7 @@ type CommandGroup struct {
 }
 
 type CmdExecutor struct {
-	logger    log.Logger
+	logger    *slog.Logger
 	parentCtx context.Context
 	commands  []CommandGroup
 	parallel  bool
@@ -33,15 +32,15 @@ type CmdExecutor struct {
 }
 
 type CmdExecutorArgs struct {
-	Logger      log.Logger
+	Logger      *slog.Logger
 	Commands    []CommandGroup
 	Parallel    bool
 	Interactive bool
 }
 
 func NewCmdExecutor(ctx context.Context, args CmdExecutorArgs) *CmdExecutor {
 	if args.Logger == nil {
-		args.Logger = log.New(log.Options{})
+		args.Logger = slog.Default()
 	}
 
 	return &CmdExecutor{
@@ -61,13 +60,13 @@ func (ex *CmdExecutor) OnWatchEvent(ev Event) error {
 	return nil
 }
 
-func killPID(pid int, logger log.Logger) error {
+func killPID(pid int, logger *slog.Logger) error {
 	logger.Debug("about to kill", "process", pid)
 	if err := syscall.Kill(-pid, syscall.SIGKILL); err != nil {
 		if err == syscall.ESRCH {
 			return nil
 		}
-		logger.Error(err, "failed to kill")
+		logger.Error("failed to kill", "err", err)
 		return err
 	}
 	return nil
@@ -136,7 +135,7 @@ func (ex *CmdExecutor) exec(newCmd func(context.Context) *exec.Cmd, args execArg
 			return nil
 		}
 
-		logger.Error(err, "command failed")
+		logger.Error("command failed", "err", err)
 		if exitErr, ok := err.(*exec.ExitError); ok {
 			logger.Debug("process finished", "exit.code", exitErr.ExitCode())
 			if exitErr.ExitCode() != 0 {
@@ -157,7 +156,7 @@ func (ex *CmdExecutor) exec(newCmd func(context.Context) *exec.Cmd, args execArg
 		err = proc.Signal(syscall.SIGTERM)
 		if err != nil {
 			if err != syscall.ESRCH {
-				logger.Error(err, "failed to kill")
+				logger.Error("failed to kill", "err", err)
 				return err
 			}
 			return err

pkg/watcher/lib.go

@@ -50,7 +50,7 @@ func (f *Watcher) WatchAndExecute(ctx context.Context, executors []executor.Exec
 	go func() {
 		defer wg.Done()
 		if err := ex.Start(); err != nil {
-			f.Logger.Error(err, "starting command")
+			f.Logger.Error("starting command", "err", err)
 		}
 		f.Logger.Debug("final executor start finished")
 	}()

pkg/watcher/lib_test.go

@@ -4,22 +4,18 @@ import (
 	"bytes"
 	"context"
 	"io"
-	"os"
+	"log/slog"
 	"os/exec"
 	"strings"
 	"testing"
 	"time"
 
 	"github.com/fsnotify/fsnotify"
 	"github.com/nxtcoder17/fwatcher/pkg/executor"
-	"github.com/nxtcoder17/go.pkgs/log"
 )
 
 func Test_Watcher_WatchAndExecute(t *testing.T) {
-	logger := log.New(log.Options{
-		ShowDebugLogs: os.Getenv("DEBUG") == "true",
-	})
-
+	logger := slog.Default()
 	newCmd := func(stdout io.Writer, cmd string, args ...string) func(c context.Context) *exec.Cmd {
 		return func(c context.Context) *exec.Cmd {
 			cmd := exec.CommandContext(c, cmd, args...)

pkg/watcher/watcher.go

@@ -3,21 +3,21 @@ package watcher
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 
 	"github.com/fsnotify/fsnotify"
-	"github.com/nxtcoder17/go.pkgs/log"
 )
 
 type Watcher struct {
 	watcher *fsnotify.Watcher
 
 	directoryCount int
 
-	Logger         log.Logger
+	Logger         *slog.Logger
 	OnlySuffixes   []string
 	IgnoreSuffixes []string
 
@@ -216,7 +216,7 @@ func (f *Watcher) RecursiveAdd(dirs ...string) error {
 
 func (f *Watcher) addToWatchList(dir string) error {
 	if err := f.watcher.Add(dir); err != nil {
-		f.Logger.Error(err, "failed to add directory", "dir", dir)
+		f.Logger.Error("failed to add directory", "dir", dir, "err", err)
 		return err
 	}
 	f.directoryCount++
@@ -231,7 +231,7 @@ func (f *Watcher) Close() error {
 }
 
 type WatcherArgs struct {
-	Logger log.Logger
+	Logger *slog.Logger
 
 	WatchDirs        []string
 	WatchExtensions  []string
@@ -262,7 +262,7 @@ var DefaultIgnoreExtensions = []string{
 
 func NewWatcher(ctx context.Context, args WatcherArgs) (*Watcher, error) {
 	if args.Logger == nil {
-		args.Logger = log.New(log.Options{})
+		args.Logger = slog.Default()
 	}
 
 	args.IgnoreDirs = append(args.IgnoreDirs, args.IgnoreList...)
@@ -302,7 +302,7 @@ func NewWatcher(ctx context.Context, args WatcherArgs) (*Watcher, error) {
 
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
-		args.Logger.Error(err, "failed to create watcher")
+		args.Logger.Error("failed to create watcher", "err", err)
 		return nil, err
 	}