From 087bf92d707de1a838451719da505f69b6934087 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 29 十一月 2019 18:03:27 +0800
Subject: [PATCH] 换log
---
algorithm/middleware/middleware.go | 2
algorithm/intrusion/intrusion.go | 2
ruleserver/server.go | 2
ruleserver/ruleToformula.go | 2
algorithm/static/static.go | 2
ruleserver/attachInfo.go | 2
ruleserver/personTrack.go | 2
ruleserver/readyDataForRule.go | 2
algorithm/personUnsual/personUnsual.go | 2
labelFilter/req.go | 2
algorithm/faceCompare/faceCompare.go | 2
insertdata/insertDataToEs.go | 2
ruleserver/pushPolygonForTrack.go | 2
algorithm/middleware/readyData.go | 2
algorithm/face/face.go | 2
main.go | 30 +++++++-------
algorithm/car/plate.go | 2
ruleserver/geoPolygon_test.go | 2
labelFilter/readyDataForLabel.go | 2
labelFilter/ruleForLabel.go | 2
ruleserver/timeTicker.go | 2
21 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/algorithm/car/plate.go b/algorithm/car/plate.go
index a2d6170..595dd1f 100644
--- a/algorithm/car/plate.go
+++ b/algorithm/car/plate.go
@@ -2,7 +2,7 @@
import (
"basic.com/pubsub/protomsg.git"
-"basic.com/valib/logger.git"
+logger "github.com/jeanphorn/log4go"
"github.com/knetic/govaluate"
"ruleprocess/structure"
"strconv"
diff --git a/algorithm/face/face.go b/algorithm/face/face.go
index 6a90334..c4dedde 100644
--- a/algorithm/face/face.go
+++ b/algorithm/face/face.go
@@ -2,7 +2,7 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"github.com/knetic/govaluate"
"ruleprocess/structure"
"strconv"
diff --git a/algorithm/faceCompare/faceCompare.go b/algorithm/faceCompare/faceCompare.go
index f297ca2..6fca62b 100644
--- a/algorithm/faceCompare/faceCompare.go
+++ b/algorithm/faceCompare/faceCompare.go
@@ -2,7 +2,7 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"github.com/knetic/govaluate"
"ruleprocess/structure"
"strconv"
diff --git a/algorithm/intrusion/intrusion.go b/algorithm/intrusion/intrusion.go
index 6a2752f..7e1df9d 100644
--- a/algorithm/intrusion/intrusion.go
+++ b/algorithm/intrusion/intrusion.go
@@ -2,7 +2,7 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"github.com/knetic/govaluate"
"ruleprocess/structure"
"strconv"
diff --git a/algorithm/middleware/middleware.go b/algorithm/middleware/middleware.go
index 4a879ef..ca3b6f3 100644
--- a/algorithm/middleware/middleware.go
+++ b/algorithm/middleware/middleware.go
@@ -2,7 +2,7 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"encoding/json"
"github.com/knetic/govaluate"
"plugin"
diff --git a/algorithm/middleware/readyData.go b/algorithm/middleware/readyData.go
index 83f9607..839a2d1 100644
--- a/algorithm/middleware/readyData.go
+++ b/algorithm/middleware/readyData.go
@@ -2,7 +2,7 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"github.com/golang/protobuf/proto"
uuid "github.com/satori/go.uuid"
"ruleprocess/ruleserver"
diff --git a/algorithm/personUnsual/personUnsual.go b/algorithm/personUnsual/personUnsual.go
index ba172c8..7a6fc41 100644
--- a/algorithm/personUnsual/personUnsual.go
+++ b/algorithm/personUnsual/personUnsual.go
@@ -2,7 +2,7 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"github.com/knetic/govaluate"
"ruleprocess/structure"
"strconv"
diff --git a/algorithm/static/static.go b/algorithm/static/static.go
index 6083668..b2a8f87 100644
--- a/algorithm/static/static.go
+++ b/algorithm/static/static.go
@@ -2,7 +2,7 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"github.com/knetic/govaluate"
"ruleprocess/ruleserver"
"ruleprocess/structure"
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index f7d7143..6641679 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,7 +1,7 @@
package insertdata
import (
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"encoding/base64"
"encoding/json"
"errors"
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index 2ebad26..1024602 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -1,7 +1,7 @@
package labelFilter
import (
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"ruleprocess/cache"
"ruleprocess/structure"
"time"
diff --git a/labelFilter/req.go b/labelFilter/req.go
index 2e6b994..b9a0907 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -2,7 +2,7 @@
import (
"basic.com/dbapi.git"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"fmt"
"nanomsg.org/go-mangos"
"nanomsg.org/go-mangos/protocol/rep"
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 4323b0b..df26598 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -3,7 +3,7 @@
import (
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"github.com/golang/protobuf/proto"
"github.com/knetic/govaluate"
"ruleprocess/structure"
diff --git a/main.go b/main.go
index eceb6a8..38d7e69 100644
--- a/main.go
+++ b/main.go
@@ -12,11 +12,11 @@
"ruleprocess/structure"
"time"
- "basic.com/valib/logger.git"
+ //"basic.com/valib/logger.git"
"flag"
"fmt"
- "github.com/spf13/viper"
- log "github.com/jeanphorn/log4go"
+ //"github.com/spf13/viper"
+ logger "github.com/jeanphorn/log4go"
"ruleprocess/cache"
"ruleprocess/ruleserver"
"sync"
@@ -34,18 +34,18 @@
// 鏃ュ織鍒濆鍖�
insertdata.Init(*env)
- var logFile = "./logger/"
- if viper.GetString("LogBasePath") != "" {
- logFile = viper.GetString("LogBasePath")
- }
- logFile = logFile + "ruleprocess.log"
- fmt.Println("鏃ュ織鍦板潃锛�",logFile)
- logger.Config(logFile, logger.DebugLevel)
- logger.SetSaveDays(7)
+ //var logFile = "./logger/"
+ //if viper.GetString("LogBasePath") != "" {
+ // logFile = viper.GetString("LogBasePath")
+ //}
+ //logFile = logFile + "ruleprocess.log"
+ //fmt.Println("鏃ュ織鍦板潃锛�",logFile)
+ //logger.Config(logFile, logger.DebugLevel)
+ //logger.SetSaveDays(7)
+ // log4go
+ logger.LoadConfiguration("./logger/log4go.json")
logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒")
- // log4go
- log.LoadConfiguration("./logger/log4go.json")
}
func main() {
//fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
@@ -93,7 +93,7 @@
//go func(msg []byte) {
logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
- log.Warn(time.Now().Format("2006-01-02 15:04:05"))
+ //logger.Warn(time.Now().Format("2006-01-02 15:04:05"))
arg := structure.SdkDatas{}
//paramFormat(msg, &arg)
start := time.Now()
@@ -118,7 +118,7 @@
}
func CallParamFormat(msg []byte, args *structure.SdkDatas) protomsg.SdkMessage{
- log.Info("鍛煎彨涓棿浠舵牸寮忓寲鏁版嵁")
+ logger.Info("鍛煎彨涓棿浠舵牸寮忓寲鏁版嵁")
p,err := plugin.Open("./algorithm/middleware.so")
if err != nil {
panic(err)
diff --git a/ruleserver/attachInfo.go b/ruleserver/attachInfo.go
index cc2b5ab..5049e98 100644
--- a/ruleserver/attachInfo.go
+++ b/ruleserver/attachInfo.go
@@ -2,7 +2,7 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
uuid "github.com/satori/go.uuid"
"ruleprocess/cache"
)
diff --git a/ruleserver/geoPolygon_test.go b/ruleserver/geoPolygon_test.go
index 7f6c9ee..fac0092 100644
--- a/ruleserver/geoPolygon_test.go
+++ b/ruleserver/geoPolygon_test.go
@@ -1,7 +1,7 @@
package ruleserver
import (
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"encoding/json"
"fmt"
"ruleprocess/structure"
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index b693495..a784b6a 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -3,7 +3,7 @@
import (
"basic.com/pubsub/protomsg.git"
"github.com/golang/protobuf/proto"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"ruleprocess/structure"
"sync"
)
diff --git a/ruleserver/pushPolygonForTrack.go b/ruleserver/pushPolygonForTrack.go
index 5cfe6a2..2d80246 100644
--- a/ruleserver/pushPolygonForTrack.go
+++ b/ruleserver/pushPolygonForTrack.go
@@ -3,7 +3,7 @@
import (
"basic.com/pubsub/protomsg.git"
"ruleprocess/cache"
- "ruleprocess/logger"
+ logger "github.com/jeanphorn/log4go"
"ruleprocess/structure"
"github.com/kirinlabs/HttpRequest"
"strconv"
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 033a2b3..d01f250 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -3,7 +3,7 @@
import (
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"encoding/json"
"errors"
"fmt"
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index a0abea7..c8985b8 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -5,7 +5,7 @@
"github.com/knetic/govaluate"
"plugin"
"ruleprocess/cache"
- "ruleprocess/logger"
+ logger "github.com/jeanphorn/log4go"
"ruleprocess/structure"
"sort"
"strconv"
diff --git a/ruleserver/server.go b/ruleserver/server.go
index 2ba38db..7d8f02e 100644
--- a/ruleserver/server.go
+++ b/ruleserver/server.go
@@ -4,7 +4,7 @@
"basic.com/pubsub/protomsg.git"
"basic.com/valib/gopherdiscovery.git"
"github.com/gogo/protobuf/proto"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"time"
)
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index c0c0037..ea6a36e 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -2,7 +2,7 @@
import (
"fmt"
- "basic.com/valib/logger.git"
+ logger "github.com/jeanphorn/log4go"
"ruleprocess/structure"
"strings"
"time"
--
Gitblit v1.8.0