From 8dcedb0ce7a1648000db644aaf4c37fad9ff3718 Mon Sep 17 00:00:00 2001
From: ehlxr <ehlxr.me@gmail.com>
Date: Fri, 8 Nov 2019 17:45:09 +0800
Subject: [PATCH] release v0.0.4

---
 crash/crash_darwin.go |  4 +---
 crash/crash_unix.go   |  4 +---
 crash/crash_win.go    |  4 +---
 go.mod                |  4 ++--
 log.go                | 39 +++++++++++++++++++--------------------
 log_test.go           |  4 +---
 version               |  2 +-
 7 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/crash/crash_darwin.go b/crash/crash_darwin.go
index 4f1d7c8..eba615b 100644
--- a/crash/crash_darwin.go
+++ b/crash/crash_darwin.go
@@ -6,15 +6,13 @@ import (
 	"log"
 	"os"
 	"syscall"
-
-	"github.com/pkg/errors"
 )
 
 // NewCrashLog set crash log
 func NewCrashLog(file string) {
 	f, err := os.OpenFile(file, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
 	if err != nil {
-		log.Fatalf("open crash log file error. %v", errors.WithStack(err))
+		log.Fatalf("open crash log file error. %v", err)
 	} else {
 		_ = syscall.Dup2(int(f.Fd()), 2)
 	}
diff --git a/crash/crash_unix.go b/crash/crash_unix.go
index 147d89f..17ec88e 100644
--- a/crash/crash_unix.go
+++ b/crash/crash_unix.go
@@ -6,15 +6,13 @@ import (
 	"log"
 	"os"
 	"syscall"
-
-	"github.com/pkg/errors"
 )
 
 // NewCrashLog set crash log
 func NewCrashLog(file string) {
 	f, err := os.OpenFile(file, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
 	if err != nil {
-		log.Fatalf("open crash log file error. %v", errors.WithStack(err))
+		log.Fatalf("open crash log file error. %v", err)
 	} else {
 		_ = syscall.Dup3(int(f.Fd()), 2, 0)
 	}
diff --git a/crash/crash_win.go b/crash/crash_win.go
index dc635bb..24f32dc 100644
--- a/crash/crash_win.go
+++ b/crash/crash_win.go
@@ -6,8 +6,6 @@ import (
 	"log"
 	"os"
 	"syscall"
-
-	"github.com/pkg/errors"
 )
 
 var (
@@ -34,7 +32,7 @@ func NewCrashLog(file string) {
 	} else {
 		err = setStdHandle(syscall.STD_ERROR_HANDLE, syscall.Handle(f.Fd()))
 		if err != nil {
-			log.Fatalf("open crash log file error. %v", errors.WithStack(err))
+			log.Fatalf("open crash log file error. %v", err)
 		}
 	}
 }
diff --git a/go.mod b/go.mod
index 65e2578..c5d61f2 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@ module github.com/ehlxr/log
 go 1.13
 
 require (
-	github.com/pkg/errors v0.8.1
+	github.com/ehlxr/lumberjack v2.0.0+incompatible
 	github.com/robfig/cron/v3 v3.0.0
 	go.uber.org/zap v1.12.0
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 )
diff --git a/log.go b/log.go
index 2bebb64..7c07d78 100644
--- a/log.go
+++ b/log.go
@@ -2,7 +2,7 @@ package log
 
 import (
 	"fmt"
-	"gopkg.in/natefinch/lumberjack.v2"
+	"github.com/ehlxr/lumberjack"
 	"log"
 	"os"
 	"path"
@@ -12,7 +12,6 @@ import (
 	"github.com/ehlxr/log/bufferpool"
 	"github.com/ehlxr/log/crash"
 	"github.com/ehlxr/log/encoder"
-	"github.com/pkg/errors"
 	"github.com/robfig/cron/v3"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
@@ -63,7 +62,7 @@ func (lc *logConfig) Init() {
 }
 
 func NewLogConfig() *logConfig {
-	config := &logConfig{
+	return &logConfig{
 		Level:                 DebugLevel,
 		EnableColors:          true,
 		CrashLogFilename:      "./logs/crash.log",
@@ -74,16 +73,15 @@ func NewLogConfig() *logConfig {
 		TimestampFormat:       "2006-01-02 15:04:05.000",
 		EnableCapitalLevel:    true,
 		Logger: &lumberjack.Logger{
-			Filename:   "./logs/log.log",
-			MaxSize:    200,
-			MaxAge:     0,
-			MaxBackups: 30,
-			LocalTime:  true,
-			Compress:   false,
+			Filename:         "./logs/log.log",
+			MaxSize:          200,
+			MaxAge:           0,
+			MaxBackups:       30,
+			LocalTime:        true,
+			Compress:         false,
+			BackupTimeFormat: "2006-01-02",
 		},
 	}
-
-	return config
 }
 
 func (lc *logConfig) newLogger() *zap.Logger {
@@ -234,18 +232,19 @@ func (lc *logConfig) fileWriteSyncer(fileName string) zapcore.WriteSyncer {
 	// }
 
 	writer := &lumberjack.Logger{
-		Filename:   fileName,
-		MaxSize:    lc.MaxSize, // 单个日志文件大小（MB）
-		MaxBackups: lc.MaxBackups,
-		MaxAge:     lc.MaxAge, // 保留多少天的日志
-		LocalTime:  lc.LocalTime,
-		Compress:   lc.Compress,
+		Filename:         fileName,
+		MaxSize:          lc.MaxSize, // 单个日志文件大小（MB）
+		MaxBackups:       lc.MaxBackups,
+		MaxAge:           lc.MaxAge, // 保留多少天的日志
+		LocalTime:        lc.LocalTime,
+		Compress:         lc.Compress,
+		BackupTimeFormat: lc.BackupTimeFormat,
 	}
 
 	// Rotating log files daily
 	runner := cron.New(cron.WithSeconds(), cron.WithLocation(time.UTC))
-	_, _ = runner.AddFunc("0 0 0 * * ? ", func() {
-		_ = writer.Rotate()
+	_, _ = runner.AddFunc("0 0 0 * * ?", func() {
+		_ = writer.Rotate(time.Now().AddDate(0, 0, -1))
 	})
 	go runner.Run()
 
@@ -256,7 +255,7 @@ func writeCrashLog(file string) {
 	err := os.MkdirAll(path.Dir(file), os.ModePerm)
 	if err != nil {
 		log.Fatalf("make crash log dir error. %v",
-			errors.WithStack(err))
+			err)
 	}
 
 	crash.NewCrashLog(file)
diff --git a/log_test.go b/log_test.go
index 044e058..6de1dd9 100644
--- a/log_test.go
+++ b/log_test.go
@@ -26,14 +26,12 @@ func TestLogWithConfig(t *testing.T) {
 
 func TestLogRote(t *testing.T) {
 	lc := NewLogConfig()
-	_ = lc.Level.Set("info")
-	lc.Name = "main"
 	lc.MaxSize = 1
 
 	lc.Init()
 
 	for {
 		Infof("this is %s message", "info")
-		time.Sleep(time.Second)
+		time.Sleep(time.Millisecond * 1)
 	}
 }
diff --git a/version b/version
index 90ab6e9..a92e827 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v0.0.2
\ No newline at end of file
+v0.0.4
\ No newline at end of file