|
|
@@ -3,8 +3,6 @@ package utils
|
|
|
import (
|
|
|
"encoding/json"
|
|
|
"github.com/beego/beego/v2/core/logs"
|
|
|
- "github.com/sirupsen/logrus"
|
|
|
- "gopkg.in/natefinch/lumberjack.v2"
|
|
|
"os"
|
|
|
"path"
|
|
|
)
|
|
|
@@ -15,8 +13,8 @@ const (
|
|
|
DefaultApiLogPath = "./etalogs/apilog"
|
|
|
)
|
|
|
|
|
|
-var FileLog = logrus.New()
|
|
|
-var ApiLog = logrus.New()
|
|
|
+var FileLog *logs.BeeLogger
|
|
|
+var ApiLog *logs.BeeLogger
|
|
|
var Binlog *logs.BeeLogger
|
|
|
|
|
|
func init() {
|
|
|
@@ -35,21 +33,14 @@ func init() {
|
|
|
|
|
|
// 打开文件
|
|
|
logFileName := path.Join(logPath, logFile)
|
|
|
- logConf := getDefaultLogrusConfig(logFileName)
|
|
|
- // 使用滚动压缩方式记录日志
|
|
|
- rolling(FileLog, logConf)
|
|
|
- //rolling(bLogFileName)
|
|
|
- // 设置日志输出JSON格式
|
|
|
- jsonFormat := new(logrus.JSONFormatter)
|
|
|
- jsonFormat.DisableHTMLEscape = true
|
|
|
- jsonFormat.TimestampFormat = HlbFormatDateTime
|
|
|
- FileLog.SetFormatter(jsonFormat)
|
|
|
- FileLog.SetReportCaller(true)
|
|
|
- //LogInstance.SetFormatter(&logrus.TextFormatter{})
|
|
|
- // 设置日志记录级别
|
|
|
- //FileLog.SetLevel(logrus.DebugLevel)
|
|
|
+ FileLog = logs.NewLogger(1000000)
|
|
|
+ logConf := getDefaultLogConfig()
|
|
|
+
|
|
|
+ logConf.FileName = logFileName
|
|
|
+ b, _ := json.Marshal(logConf)
|
|
|
+ FileLog.SetLogger(logs.AdapterFile, string(b))
|
|
|
+ FileLog.EnableFuncCallDepth(true)
|
|
|
|
|
|
- //FileLog.Info("abc")
|
|
|
initBinlog()
|
|
|
initApiLog()
|
|
|
}
|
|
|
@@ -83,8 +74,8 @@ func initBinlog() {
|
|
|
logConf := getDefaultLogConfig()
|
|
|
|
|
|
logConf.FileName = logFileName
|
|
|
- logConf.MaxLines = 10000000
|
|
|
- logConf.Rotate = true
|
|
|
+ //logConf.MaxLines = 10000000
|
|
|
+ //logConf.Rotate = true
|
|
|
b, _ := json.Marshal(logConf)
|
|
|
Binlog.SetLogger(logs.AdapterFile, string(b))
|
|
|
Binlog.EnableFuncCallDepth(true)
|
|
|
@@ -103,39 +94,19 @@ func initApiLog() {
|
|
|
|
|
|
// 打开文件
|
|
|
logFileName := path.Join(logPath, logFile)
|
|
|
- logConf := getDefaultLogrusConfig(logFileName)
|
|
|
- // 使用滚动压缩方式记录日志
|
|
|
- rolling(ApiLog, logConf)
|
|
|
- //rolling(bLogFileName)
|
|
|
- // 设置日志输出JSON格式
|
|
|
- jsonFormat := new(logrus.JSONFormatter)
|
|
|
- jsonFormat.DisableHTMLEscape = true
|
|
|
- jsonFormat.TimestampFormat = HlbFormatDateTime
|
|
|
- ApiLog.SetFormatter(jsonFormat)
|
|
|
-}
|
|
|
-
|
|
|
-// 日志滚动设置
|
|
|
-func rolling(fLog *logrus.Logger, config *lumberjack.Logger) {
|
|
|
- // 设置输出
|
|
|
- fLog.SetOutput(config)
|
|
|
-}
|
|
|
+ ApiLog = logs.NewLogger(1000000)
|
|
|
+ logConf := getDefaultLogConfig()
|
|
|
|
|
|
-func getDefaultLogrusConfig(logFile string) (config *lumberjack.Logger) {
|
|
|
- config = &lumberjack.Logger{
|
|
|
- Filename: logFile, //日志文件位置
|
|
|
- MaxSize: 256, // 单文件最大容量,单位是MB
|
|
|
- MaxBackups: 0, // 最大保留过期文件个数
|
|
|
- MaxAge: LogMaxDays, // 保留过期文件的最大时间间隔,单位是天
|
|
|
- Compress: true, // 是否需要压缩滚动日志, 使用的 gzip 压缩
|
|
|
- LocalTime: true,
|
|
|
- }
|
|
|
- return
|
|
|
+ logConf.FileName = logFileName
|
|
|
+ b, _ := json.Marshal(logConf)
|
|
|
+ ApiLog.SetLogger(logs.AdapterFile, string(b))
|
|
|
+ ApiLog.EnableFuncCallDepth(true)
|
|
|
}
|
|
|
|
|
|
func getDefaultLogConfig() logConfig {
|
|
|
return logConfig{
|
|
|
FileName: "",
|
|
|
- MaxLines: 0,
|
|
|
+ MaxLines: 10000000,
|
|
|
MaxSize: 1 << 28,
|
|
|
Daily: true,
|
|
|
MaxDays: LogMaxDays, //我就是喜欢31天，咋滴，不喜欢你就自己改-_-!
|
