From 2865e8a7a0428b654115f8ae2a92cc42301b6b57 Mon Sep 17 00:00:00 2001
From: Inhere <in.798@qq.com>
Date: Fri, 28 Jul 2023 14:53:43 +0800
Subject: [PATCH] :loud_sound: chore: update log message for debug ci test
 error

---
 rotatefile/util.go   | 13 +++++++------
 rotatefile/writer.go |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/rotatefile/util.go b/rotatefile/util.go
index e942cf6..7e68fd2 100644
--- a/rotatefile/util.go
+++ b/rotatefile/util.go
@@ -19,23 +19,24 @@ func compressFile(srcPath, dstPath string) error {
 	defer srcFile.Close()
 
 	// create and open a gz file
-	gzFile, err := fsutil.QuickOpenFile(dstPath)
+	gzFile, err := fsutil.OpenTruncFile(dstPath)
 	if err != nil {
 		return err
 	}
 	defer gzFile.Close()
 
-	zw := gzip.NewWriter(gzFile)
-
-	fileSt, err := srcFile.Stat()
+	srcSt, err := srcFile.Stat()
 	if err != nil {
 		return err
 	}
 
-	zw.Name = fileSt.Name()
-	zw.ModTime = fileSt.ModTime()
+	zw := gzip.NewWriter(gzFile)
+	zw.Name = srcSt.Name()
+	zw.ModTime = srcSt.ModTime()
 
+	// do copy
 	if _, err = io.Copy(zw, srcFile); err != nil {
+		_ = zw.Close()
 		return err
 	}
 	return zw.Close()
diff --git a/rotatefile/writer.go b/rotatefile/writer.go
index 0a5f18c..f8f7770 100644
--- a/rotatefile/writer.go
+++ b/rotatefile/writer.go
@@ -374,7 +374,7 @@ func (d *Writer) Clean() (err error) {
 
 			oldFiles = oldFiles[idx+1:]
 			if err != nil {
-				return err
+				return errorx.Wrap(err, "remove old file error")
 			}
 		}
 	}
@@ -427,9 +427,9 @@ func (d *Writer) compressFiles(oldFiles []fileInfo) error {
 			return errorx.Wrap(err, "compress old file error")
 		}
 
-		// remove raw log file
+		// remove old log file
 		if err = os.Remove(fi.filePath); err != nil {
-			return err
+			return errorx.Wrap(err, "remove file error after compress")
 		}
 	}
 	return nil