|
@@ -6,13 +6,18 @@ import (
|
|
"path/filepath"
|
|
"path/filepath"
|
|
"time"
|
|
"time"
|
|
|
|
|
|
|
|
+ "github.com/allanpk716/ChineseSubFinder/pkg/settings"
|
|
|
|
+
|
|
|
|
+ "github.com/allanpk716/ChineseSubFinder/pkg/extend_log"
|
|
|
|
+
|
|
"github.com/allanpk716/ChineseSubFinder/pkg/global_value"
|
|
"github.com/allanpk716/ChineseSubFinder/pkg/global_value"
|
|
rotatelogs "github.com/lestrrat-go/file-rotatelogs"
|
|
rotatelogs "github.com/lestrrat-go/file-rotatelogs"
|
|
"github.com/sirupsen/logrus"
|
|
"github.com/sirupsen/logrus"
|
|
|
|
+
|
|
easy "github.com/t-tomalak/logrus-easy-formatter"
|
|
easy "github.com/t-tomalak/logrus-easy-formatter"
|
|
)
|
|
)
|
|
|
|
|
|
-func NewLogHelper(appName string, logStorePath string, level logrus.Level, maxAge time.Duration, rotationTime time.Duration) *logrus.Logger {
|
|
|
|
|
|
+func NewLogHelper(appName string, logStorePath string, level logrus.Level, maxAge time.Duration, rotationTime time.Duration, extendLog ...settings.ExtendLog) *logrus.Logger {
|
|
|
|
|
|
Logger := logrus.New()
|
|
Logger := logrus.New()
|
|
Logger.Formatter = &easy.Formatter{
|
|
Logger.Formatter = &easy.Formatter{
|
|
@@ -32,6 +37,10 @@ func NewLogHelper(appName string, logStorePath string, level logrus.Level, maxAg
|
|
Logger.SetLevel(level)
|
|
Logger.SetLevel(level)
|
|
Logger.SetOutput(io.MultiWriter(os.Stderr, writer))
|
|
Logger.SetOutput(io.MultiWriter(os.Stderr, writer))
|
|
|
|
|
|
|
|
+ if len(extendLog) > 0 {
|
|
|
|
+ exLog := extend_log.ExtendLogEx{}
|
|
|
|
+ exLog.AddHook(Logger, extendLog[0])
|
|
|
|
+ }
|
|
// 可以输出函数调用还文件位置
|
|
// 可以输出函数调用还文件位置
|
|
//if level == logrus.DebugLevel {
|
|
//if level == logrus.DebugLevel {
|
|
// Logger.SetReportCaller(true)
|
|
// Logger.SetReportCaller(true)
|