👔 up: rotatefile - update some for print error output

gookit · Jul 5, 2023 · 96eedaf · 96eedaf
1 parent ccc8922
commit 96eedaf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/rotatefile/cleanup.go b/rotatefile/cleanup.go
@@ -97,9 +97,7 @@ func (r *FilesClear) CleanDaemon() {
 
 	t := time.NewTicker(flushInterval)
 	for range t.C {
-		if err := r.Clean(); err != nil {
-			printErrln("files-clear: clean old files error:", err)
-		}
+		printErrln("files-clear: clean old files error:", r.Clean())
 	}
 }
 

diff --git a/rotatefile/rotatefile.go b/rotatefile/rotatefile.go
@@ -59,6 +59,8 @@ const (
 	DefaultBackTime uint = 24 * 7
 )
 
-func printErrln(args ...any) {
-	_, _ = fmt.Fprintln(os.Stderr, args...)
+func printErrln(pfx string, err error) {
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, pfx, err)
+	}
 }
diff --git a/rotatefile/writer.go b/rotatefile/writer.go
@@ -265,10 +265,7 @@ func (d *Writer) asyncCleanBackups() {
 
 	// TODO pref: only start once
 	go func() {
-		err := d.Clean()
-		if err != nil {
-			printErrln("rotatefile: clean backup files error:", err)
-		}
+		printErrln("rotatefile: clean backup files error:", d.Clean())
 	}()
 }
 
@@ -373,11 +370,7 @@ func (d *Writer) buildFilterFns(fileName string) []filterFunc {
 			}
 
 			// remove expired files
-			err := os.Remove(fPath)
-			if err != nil {
-				printErrln("rotatefile: remove expired file error:", err)
-			}
-
+			printErrln("rotatefile: remove expired file error:", os.Remove(fPath))
 			return false
 		})
 	}