From 9f6e6fad998d74952fe2f4ea06243e60c5d8cb88 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 04 九月 2019 17:13:56 +0800
Subject: [PATCH] add logger library
---
discovery/server.go | 2
middlewares/auth/auth.go | 2
service/FaceCompareService.go | 2
service/SdkDownLoad.go | 2
service/EnableStatusControlService.go | 2
controllers/esSearch.go | 2
controllers/cameraTaskArgs.go | 2
controllers/dbtableperson.go | 2
controllers/sdk.go | 2
service/FaceSdkService.go | 2
controllers/dbtablesCon.go | 2
controllers/fileController.go | 2
/dev/null | 217 -------------------------------------------
controllers/camera.go | 2
main.go | 2
controllers/sysMenu.go | 2
service/FDetectClient.go | 2
17 files changed, 16 insertions(+), 233 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index b800bb7..e16b611 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -4,7 +4,7 @@
"encoding/json"
"fmt"
"strconv"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"github.com/gin-gonic/gin"
diff --git a/controllers/cameraTaskArgs.go b/controllers/cameraTaskArgs.go
index bdf36d8..2dc84df 100644
--- a/controllers/cameraTaskArgs.go
+++ b/controllers/cameraTaskArgs.go
@@ -5,7 +5,7 @@
"github.com/gin-gonic/gin"
"strconv"
"webserver/extend/code"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"webserver/extend/util"
)
diff --git a/controllers/dbtableperson.go b/controllers/dbtableperson.go
index 88766f3..b208eb3 100644
--- a/controllers/dbtableperson.go
+++ b/controllers/dbtableperson.go
@@ -10,7 +10,7 @@
"sort"
"strconv"
"time"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"webserver/service"
"github.com/gin-gonic/gin"
diff --git a/controllers/dbtablesCon.go b/controllers/dbtablesCon.go
index e1e75bf..9ebfd35 100644
--- a/controllers/dbtablesCon.go
+++ b/controllers/dbtablesCon.go
@@ -10,7 +10,7 @@
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"webserver/extend/util"
"webserver/models"
)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 411fe93..9172bac 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -9,7 +9,7 @@
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"webserver/extend/util"
"webserver/models"
)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index bf08b29..d464bd3 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -27,7 +27,7 @@
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"webserver/extend/util"
"webserver/models"
"webserver/service"
diff --git a/controllers/sdk.go b/controllers/sdk.go
index de1930b..a9ba8a3 100644
--- a/controllers/sdk.go
+++ b/controllers/sdk.go
@@ -5,7 +5,7 @@
uuid "github.com/satori/go.uuid"
"webserver/extend/code"
"webserver/extend/config"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"webserver/extend/util"
"github.com/gin-gonic/gin"
"webserver/service"
diff --git a/controllers/sysMenu.go b/controllers/sysMenu.go
index f629b5d..e4a33c4 100644
--- a/controllers/sysMenu.go
+++ b/controllers/sysMenu.go
@@ -3,7 +3,7 @@
import (
"github.com/gin-gonic/gin"
"webserver/extend/code"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"webserver/extend/util"
"webserver/middlewares/auth"
)
diff --git a/discovery/server.go b/discovery/server.go
index 4b37c53..58a5146 100644
--- a/discovery/server.go
+++ b/discovery/server.go
@@ -5,7 +5,7 @@
// "basic.com/valib/gopherdiscovery.git"
// "github.com/gogo/protobuf/proto"
// "time"
-// "webserver/extend/logger"
+// "basic.com/valib/logger.git"
//)
//
//const (
diff --git a/extend/logger/logger.go b/extend/logger/logger.go
deleted file mode 100644
index ecfbbd2..0000000
--- a/extend/logger/logger.go
+++ /dev/null
@@ -1,217 +0,0 @@
-package logger
-
-import (
- "fmt"
- "log"
- "os"
- "os/exec"
- "strings"
- "time"
-)
-
-const (
- PanicLevel int = iota
- FatalLevel
- ErrorLevel
- WarnLevel
- InfoLevel
- DebugLevel
-)
-
-const (
- color_red = uint8(iota + 91)
- color_green // 缁�
- color_yellow // 榛�
- color_blue // 钃�
- color_magenta // 娲嬬孩
-)
-
-const (
- fatalPrefix = "[FATAL] "
- errorPrefix = "[ERROR] "
- warnPrefix = "[WARN] "
- infoPrefix = "[INFO] "
- debugPrefix = "[DEBUG] "
-)
-
-const (
- ByDay int = iota
- ByWeek
- ByMonth
- BySize
-)
-
-type LogFile struct {
- 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
-}
-
-func Config(logFolder string, level int) {
- logFile.fileName = logFolder
- logFile.level = level
-
- log.SetOutput(logFile)
- //log.SetFlags(log.Lmicroseconds | log.Lshortfile)
- log.SetFlags(log.Ldate | log.Ltime)
-}
-func GetLogFile() (*LogFile) {
- return &logFile
-}
-
-func SetLevel(level int) {
- logFile.level = level
-}
-
-func SetSaveMode(saveMode int) {
- logFile.saveMode = saveMode
-}
-
-func SetSaveDays(saveDays int) {
- logFile.saveDays = saveDays
-}
-
-func SetSaveSize(saveSize int64) {
- logFile.filesize = saveSize
-}
-
-func Debug(args ...interface{}) {
- if logFile.level >= DebugLevel {
- log.SetPrefix(blue(debugPrefix))
- _ = log.Output(2, fmt.Sprintln(args...))
- }
-}
-
-func Info(args ...interface{}) {
- if logFile.level >= InfoLevel {
- log.SetPrefix(green(infoPrefix))
- _ = log.Output(2, fmt.Sprintln(args...))
- }
-}
-
-func Warn(args ...interface{}) {
- if logFile.level >= WarnLevel {
- log.SetPrefix(magenta(warnPrefix))
- _ = log.Output(2, fmt.Sprintln(args...))
- }
-}
-
-func Error(args ...interface{}) {
- if logFile.level >= ErrorLevel {
- log.SetPrefix(red(errorPrefix))
- _ = log.Output(2, fmt.Sprintln(args...))
- }
-}
-
-func Fatal(args ...interface{}) {
- if logFile.level >= FatalLevel {
- log.SetPrefix(red(fatalPrefix))
- _ = log.Output(2, fmt.Sprintln(args...))
- }
-}
-
-func GetRedPrefix(s string) string {
- return fmt.Sprintf("\x1b[%dm%s\x1b[0m", color_red, s)
-}
-
-func red(s string) string {
- return fmt.Sprintf("\x1b[%dm%s\x1b[0m", color_red, s)
-}
-
-func green(s string) string {
- return fmt.Sprintf("\x1b[%dm%s\x1b[0m", color_green, s)
-}
-
-func yellow(s string) string {
- return fmt.Sprintf("\x1b[%dm%s\x1b[0m", color_yellow, s)
-}
-
-func blue(s string) string {
- return fmt.Sprintf("\x1b[%dm%s\x1b[0m", color_blue, s)
-}
-
-func magenta(s string) string {
- return fmt.Sprintf("\x1b[%dm%s\x1b[0m", color_magenta, s)
-}
-
-func (me LogFile) Write(buf []byte) (n int, err error) {
- if me.fileName == "" {
- fmt.Printf("consol: %s", buf)
- return len(buf), nil
- }
-
- switch logFile.saveMode {
- case BySize:
- fileInfo, err := os.Stat(logFile.fileName)
- if err != nil {
- logFile.createLogFile()
- logFile.logTime = time.Now().Unix()
- }else {
- filesize:= fileInfo.Size();
- if logFile.fileFd == nil ||
- filesize > logFile.filesize {
- logFile.createLogFile()
- logFile.logTime = time.Now().Unix()
- }
- }
- default: // 榛樿鎸夊ぉ ByDay
- if logFile.logTime+3600 < time.Now().Unix() {
- logFile.createLogFile()
- logFile.logTime = time.Now().Unix()
- }
- }
-
- if logFile.fileFd == nil {
- fmt.Printf("log fileFd is nil !\n")
- return len(buf), nil
- }
-
- return logFile.fileFd.Write(buf)
-}
-
-func (me *LogFile) createLogFile() {
- logdir := "./logger/"
- if index := strings.LastIndex(me.fileName, "/"); index != -1 {
- logdir = me.fileName[0:index] + "/"
- os.MkdirAll(me.fileName[0:index], os.ModePerm)
- }
-
- now := time.Now()
- 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")
- tarCmd.Run()
-
- rmCmd := exec.Command("/bin/sh", "-c",
- "find "+logdir+` -type f -mtime +` +string(logFile.saveDays)+ ` -exec rm {} \;`)
- rmCmd.Run()
- }()
- }
-
- for index := 0; index < 10; index++ {
- if fd, err := os.OpenFile(me.fileName, os.O_CREATE|os.O_APPEND|os.O_WRONLY, os.ModeExclusive); nil == err {
- me.fileFd.Sync()
- me.fileFd.Close()
- me.fileFd = fd
- break
- }else {
- fmt.Println("Open logfile error! err: ", err.Error())
- }
- me.fileFd = nil
- }
-}
\ No newline at end of file
diff --git a/main.go b/main.go
index 2d8d6da..ab19bd5 100644
--- a/main.go
+++ b/main.go
@@ -7,7 +7,7 @@
"github.com/robfig/cron"
"strconv"
"webserver/extend/config"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"webserver/router"
"webserver/service"
)
diff --git a/middlewares/auth/auth.go b/middlewares/auth/auth.go
index 8a23438..4c7c75d 100644
--- a/middlewares/auth/auth.go
+++ b/middlewares/auth/auth.go
@@ -5,7 +5,7 @@
"net/http"
"strings"
"webserver/extend/config"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
)
const (
diff --git a/service/EnableStatusControlService.go b/service/EnableStatusControlService.go
index 0c760b7..301859a 100644
--- a/service/EnableStatusControlService.go
+++ b/service/EnableStatusControlService.go
@@ -9,7 +9,7 @@
"time"
"webserver/extend/config"
"webserver/extend/esutil"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
)
func GetVerificationData() []map[string]interface{} {
diff --git a/service/FDetectClient.go b/service/FDetectClient.go
index 68ddce8..dd40813 100644
--- a/service/FDetectClient.go
+++ b/service/FDetectClient.go
@@ -6,7 +6,7 @@
"errors"
"time"
"webserver/extend/config"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"google.golang.org/grpc"
)
diff --git a/service/FaceCompareService.go b/service/FaceCompareService.go
index 04d5040..67e8eb8 100644
--- a/service/FaceCompareService.go
+++ b/service/FaceCompareService.go
@@ -10,7 +10,7 @@
"nanomsg.org/go-mangos/transport/tcp"
"sync"
"webserver/extend/config"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
)
type FaceCompareService struct {
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 1258f11..aacbc18 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -7,7 +7,7 @@
"gocv.io/x/gocv"
"image"
"time"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
)
type FaceSdkService struct {
diff --git a/service/SdkDownLoad.go b/service/SdkDownLoad.go
index 56ed6e2..00715d9 100644
--- a/service/SdkDownLoad.go
+++ b/service/SdkDownLoad.go
@@ -10,7 +10,7 @@
"net/http"
"os"
"strings"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"webserver/util"
)
--
Gitblit v1.8.0