From 10503ddbe9f65f03dca53d1dd4d4b3a72fc7e6af Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 13 十一月 2019 14:38:26 +0800
Subject: [PATCH] 删除islink
---
logger/logger.go | 76 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/logger/logger.go b/logger/logger.go
index c7bb6c5..82d7a77 100644
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -17,47 +17,47 @@
InfoLevel
DebugLevel
)
-
+var loggerString string = ""
const (
color_red = uint8(iota + 91)
- color_green // 缁�
- color_yellow // 榛�
- color_blue // 钃�
- color_magenta // 娲嬬孩
+ color_green // 缁�
+ color_yellow // 榛�
+ color_blue // 钃�
+ color_magenta // 娲嬬孩
)
const (
- fatalPrefix = "[FATAL] "
- errorPrefix = "[ERROR] "
- warnPrefix = "[WARN] "
- infoPrefix = "[INFO] "
- debugPrefix = "[DEBUG] "
+ fatalPrefix = "[FATAL] "
+ errorPrefix = "[ERROR] "
+ warnPrefix = "[WARN] "
+ infoPrefix = "[INFO] "
+ debugPrefix = "[DEBUG] "
)
const (
- ByDay int = iota
+ ByDay int = iota
ByWeek
ByMonth
BySize
)
type LogFile struct {
- level int // 鏃ュ織绛夌骇
- saveMode int // 淇濆瓨妯″紡
- saveDays int // 鏃ュ織淇濆瓨澶╂暟
- logTime int64 //
- fileName string // 鏃ュ織鏂囦欢鍚�
- filesize int64 // 鏂囦欢澶у皬, 闇�瑕佽缃� saveMode 涓� BySize 鐢熸晥
+ level int // 鏃ュ織绛夌骇
+ saveMode int // 淇濆瓨妯″紡
+ saveDays int // 鏃ュ織淇濆瓨澶╂暟
+ logTime int64 //
+ fileName string // 鏃ュ織鏂囦欢鍚�
+ filesize int64 // 鏂囦欢澶у皬, 闇�瑕佽缃� saveMode 涓� BySize 鐢熸晥
fileFd *os.File
}
var logFile LogFile
func init() {
- logFile.saveMode = ByDay // 榛樿鎸夊ぉ淇濆瓨
- logFile.saveDays = 15 // 榛樿淇濆瓨涓夊ぉ鐨�
- logFile.level = ErrorLevel
- logFile.filesize = 1024 * 1024 * 10 // 榛樿10M锛� 闇�瑕佽缃� saveMode 涓� BySize
+ logFile.saveMode = ByDay // 榛樿鎸夊ぉ淇濆瓨
+ logFile.saveDays = 7 // 榛樿淇濆瓨涓夊ぉ鐨�
+ logFile.level = DebugLevel
+ //logFile.filesize = 1024 * 1024 * 10 // 榛樿10M锛� 闇�瑕佽缃� saveMode 涓� BySize
}
func Config(logFolder string, level int) {
@@ -65,7 +65,7 @@
logFile.level = level
log.SetOutput(logFile)
- //logger.SetFlags(logger.Lmicroseconds | logger.Lshortfile)
+ //log.SetFlags(log.Lmicroseconds | log.Lshortfile)
log.SetFlags(log.Ldate | log.Ltime)
}
func GetLogFile() (*LogFile) {
@@ -91,36 +91,44 @@
func Debug(args ...interface{}) {
if logFile.level >= DebugLevel {
log.SetPrefix(blue(debugPrefix))
- log.Output(2, fmt.Sprintln(args...))
+ _ = log.Output(2, fmt.Sprintln(args...))
+ //loggerString += fmt.Sprintln(args...)
}
}
-func Info(format string, args ...interface{}) {
+func Info(args ...interface{}) {
if logFile.level >= InfoLevel {
log.SetPrefix(green(infoPrefix))
- log.Output(2, fmt.Sprintln(args...))
+ _ = log.Output(2, fmt.Sprintln(args...))
+ //loggerString += fmt.Sprintln(args...)
}
}
-func Warn(format string, args ...interface{}) {
+func Warn(args ...interface{}) {
if logFile.level >= WarnLevel {
log.SetPrefix(magenta(warnPrefix))
- log.Output(2, fmt.Sprintln(args...))
+ _ = log.Output(2, fmt.Sprintln(args...))
+ //loggerString += fmt.Sprintln(args...)
}
}
func Error(args ...interface{}) {
if logFile.level >= ErrorLevel {
log.SetPrefix(red(errorPrefix))
- log.Output(2, fmt.Sprintln(args...))
+ _ = log.Output(2, fmt.Sprintln(args...))
+ //loggerString += fmt.Sprintln(args...)
}
}
-func Fatalf(args ...interface{}) {
+func Fatal(args ...interface{}) {
if logFile.level >= FatalLevel {
log.SetPrefix(red(fatalPrefix))
- log.Output(2, fmt.Sprintln(args...))
+ _ = log.Output(2, fmt.Sprintln(args...))
+ //loggerString += fmt.Sprintln(args...)
}
+}
+func OutPutByPanlei() {
+ _ = log.Output(2, loggerString)
}
func GetRedPrefix(s string) string {
@@ -167,7 +175,7 @@
logFile.logTime = time.Now().Unix()
}
}
- default: // 榛樿鎸夊ぉ ByDay
+ default: // 榛樿鎸夊ぉ ByDay
if logFile.logTime+3600 < time.Now().Unix() {
logFile.createLogFile()
logFile.logTime = time.Now().Unix()
@@ -175,7 +183,7 @@
}
if logFile.fileFd == nil {
- fmt.Printf("logger fileFd is nil !\n")
+ fmt.Printf("log fileFd is nil !\n")
return len(buf), nil
}
@@ -190,8 +198,8 @@
}
now := time.Now()
- filename := fmt.Sprintf("%s_%04d%02d%02d_%02d%02d",
- me.fileName, now.Year(), now.Month(), now.Day(), now.Hour(), now.Minute())
+ filename := fmt.Sprintf("%s_%04d%02d%02d",
+ me.fileName, now.Year(), now.Month(), now.Day())
if err := os.Rename(me.fileName, filename); err == nil {
go func() {
tarCmd := exec.Command("tar", "-zcf", filename+".tar.gz", filename, "--remove-files")
--
Gitblit v1.8.0