use slog instead of log.Printf

nil-go · Nov 11, 2023 · 89f4d0d · 89f4d0d
1 parent 3e4299a
commit 89f4d0d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 25 deletions.
diff --git a/provider/file/file.go b/provider/file/file.go
@@ -17,7 +17,7 @@ package file
 import (
 	"fmt"
 	"io/fs"
-	"log"
+	"log/slog"
 	"os"
 )
 
@@ -47,7 +47,7 @@ func (f File) Load() (map[string]any, error) {
 	}
 	if err != nil {
 		if f.ignoreNotExist && os.IsNotExist(err) {
-			log.Printf("Config file %s does not exist.", f.path)
+			slog.Warn("Config file does not exist.", "file", f.path)
 
 			return make(map[string]any), nil
 		}

diff --git a/provider/file/file_test.go b/provider/file/file_test.go
@@ -6,11 +6,9 @@
 package file_test
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	"io/fs"
-	"log"
 	"os"
 	"path/filepath"
 	"strings"
@@ -122,20 +120,6 @@ func TestFile_Load(t *testing.T) {
 	}
 }
 
-func TestFile_log(t *testing.T) {
-	buf := new(bytes.Buffer)
-	log.SetOutput(buf)
-	log.SetFlags(0)
-
-	_, err := file.New(
-		"not_found.json",
-		file.IgnoreFileNotExit(),
-	).Load()
-
-	require.NoError(t, err)
-	require.Equal(t, "Config file not_found.json does not exist.\n", buf.String())
-}
-
 func TestFile_Watch(t *testing.T) {
 	testcases := []struct {
 		description string

diff --git a/provider/file/watch.go b/provider/file/watch.go
@@ -8,7 +8,7 @@ package file
 import (
 	"context"
 	"fmt"
-	"log"
+	"log/slog"
 	"path/filepath"
 	"time"
 
@@ -26,7 +26,7 @@ func (f File) Watch(ctx context.Context, watchFunc func(map[string]any)) error {
 	}
 	defer func() {
 		if err := watcher.Close(); err != nil {
-			log.Printf("Error when closing watcher for %s: %v", f.path, err)
+			slog.Error("Error when closing file watcher.", "file", f.path, "error", err)
 		}
 	}()
 
@@ -73,12 +73,12 @@ func (f File) Watch(ctx context.Context, watchFunc func(map[string]any)) error {
 
 			switch {
 			case event.Has(fsnotify.Remove):
-				log.Printf("Config file %s has been removed.", f.path)
+				slog.Warn("Config file has been removed.", "file", f.path)
 				watchFunc(nil)
 			case event.Has(fsnotify.Create) || event.Has(fsnotify.Write):
 				values, err := f.Load()
 				if err != nil {
-					log.Printf("Error when reloading configuration from %s: %v", f.path, err)
+					slog.Error("Error when reloading config file", "file", f.path, "error", err)
 
 					continue
 				}
@@ -90,7 +90,7 @@ func (f File) Watch(ctx context.Context, watchFunc func(map[string]any)) error {
 				return nil
 			}
 
-			log.Printf("Error when watching file %s: %v", f.path, err)
+			slog.Error("Error when watching file", "file", f.path, "error", err)
 
 		case <-ctx.Done():
 			return nil

diff --git a/provider/file/watch_unsupported.go b/provider/file/watch_unsupported.go
@@ -7,12 +7,12 @@ package file
 
 import (
 	"context"
-	"log"
+	"log/slog"
 	"runtime"
 )
 
 func (f File) Watch(context.Context, func(map[string]any)) error {
-	log.Printf("File.Watch does not supported on %s.", runtime.GOOS)
+	slog.Warn("File.Watch does not supported on runtime.", "runtime", runtime.GOOS)
 
 	return nil
 }