code refactor

This commit is contained in:
MaysWind
2024-08-08 22:21:54 +08:00
parent 9ea3327517
commit 32155ca63d
+15 -5
View File
@@ -8,6 +8,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/sirupsen/logrus"
"github.com/mayswind/ezbookkeeping/pkg/errs" "github.com/mayswind/ezbookkeeping/pkg/errs"
) )
@@ -28,6 +30,14 @@ type RotateFileWriter struct {
lastRemoveOldFilesDay int lastRemoveOldFilesDay int
} }
var logFallbackLogger = logrus.New()
func init() {
logFallbackLogger.SetFormatter(&LogFormatter{})
logFallbackLogger.SetOutput(os.Stdout)
logFallbackLogger.SetLevel(logrus.InfoLevel)
}
// NewRotateFileWriter returns a new rotate file writer // NewRotateFileWriter returns a new rotate file writer
func NewRotateFileWriter(filePath string, enableRotate bool, maxFileSize int64, maxFileDays uint32) (*RotateFileWriter, error) { func NewRotateFileWriter(filePath string, enableRotate bool, maxFileSize int64, maxFileDays uint32) (*RotateFileWriter, error) {
writer := &RotateFileWriter{ writer := &RotateFileWriter{
@@ -59,7 +69,7 @@ func (w *RotateFileWriter) Write(p []byte) (n int, err error) {
err := w.rotateFile() err := w.rotateFile()
if err != nil { if err != nil {
BootErrorf("[rotate_file_writer.Write] cannot rotate log file \"%s\", because %s", w.file.Name(), err.Error()) logFallbackLogger.Errorf("[rotate_file_writer.Write] cannot rotate log file \"%s\", because %s", w.file.Name(), err.Error())
return 0, err return 0, err
} }
} }
@@ -112,7 +122,7 @@ func (w *RotateFileWriter) rotateFile() error {
func (w *RotateFileWriter) openFile() error { func (w *RotateFileWriter) openFile() error {
if w.file != nil { if w.file != nil {
BootWarnf("[rotate_file_writer.removeOldFiles] cannot reopen log file \"%s\"", w.file.Name()) logFallbackLogger.Warnf("[rotate_file_writer.removeOldFiles] cannot reopen log file \"%s\"", w.file.Name())
return nil return nil
} }
@@ -161,14 +171,14 @@ func (w *RotateFileWriter) removeOldFiles() {
} }
if len(rotateDate) != len(logRotateSuffixDateFormat) { if len(rotateDate) != len(logRotateSuffixDateFormat) {
BootErrorf("[rotate_file_writer.removeOldFiles] date suffix of old log file \"%s\" is invalid", file.Name()) logFallbackLogger.Errorf("[rotate_file_writer.removeOldFiles] date suffix of old log file \"%s\" is invalid", file.Name())
continue continue
} }
rotateDateTime, err := time.ParseInLocation(logRotateSuffixDateFormat, rotateDate, time.Now().Location()) rotateDateTime, err := time.ParseInLocation(logRotateSuffixDateFormat, rotateDate, time.Now().Location())
if err != nil { if err != nil {
BootErrorf("[rotate_file_writer.removeOldFiles] cannot parse rotate date of old log file \"%s\", because %s", file.Name(), err.Error()) logFallbackLogger.Errorf("[rotate_file_writer.removeOldFiles] cannot parse rotate date of old log file \"%s\", because %s", file.Name(), err.Error())
continue continue
} }
@@ -179,7 +189,7 @@ func (w *RotateFileWriter) removeOldFiles() {
err = os.Remove(filepath.Join(dir, file.Name())) err = os.Remove(filepath.Join(dir, file.Name()))
if err != nil { if err != nil {
BootErrorf("[rotate_file_writer.removeOldFiles] cannot remove old log file \"%s\", because %s", file.Name(), err.Error()) logFallbackLogger.Errorf("[rotate_file_writer.removeOldFiles] cannot remove old log file \"%s\", because %s", file.Name(), err.Error())
} }
} }
} }