From 9f2d7d44c4f015d9a3a94e819506dfebd5956064 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 05 七月 2019 10:52:28 +0800
Subject: [PATCH] 把部分fmt改为logger
---
logger/logger.go | 18 +++++++++---------
insertdata/insertDataToEs.go | 3 +--
ruleserver/ruleToformula.go | 30 +++++++++++++++---------------
3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index a620ce9..4fe05b4 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -3,7 +3,6 @@
import (
"encoding/json"
"errors"
- "fmt"
"net"
"ruleprocess/cache"
"ruleprocess/logger"
@@ -111,7 +110,7 @@
err = proto.Unmarshal(bdata, &i)
bigPhotoUrl := make(map[string]interface{})
bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- fmt.Println(bigPhotoUrl)
+ logger.Info(bigPhotoUrl)
if len(face.Liker) == 0 {
// 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
localConfig, err := cache.GetServerInfo()
diff --git a/logger/logger.go b/logger/logger.go
index c7bb6c5..991762d 100644
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -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,35 +91,35 @@
func Debug(args ...interface{}) {
if logFile.level >= DebugLevel {
log.SetPrefix(blue(debugPrefix))
- log.Output(2, fmt.Sprintln(args...))
+ _ = log.Output(2, 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...))
}
}
-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...))
}
}
func Error(args ...interface{}) {
if logFile.level >= ErrorLevel {
log.SetPrefix(red(errorPrefix))
- log.Output(2, fmt.Sprintln(args...))
+ _ = log.Output(2, fmt.Sprintln(args...))
}
}
func Fatalf(args ...interface{}) {
if logFile.level >= FatalLevel {
log.SetPrefix(red(fatalPrefix))
- log.Output(2, fmt.Sprintln(args...))
+ _ = log.Output(2, fmt.Sprintln(args...))
}
}
@@ -175,7 +175,7 @@
}
if logFile.fileFd == nil {
- fmt.Printf("logger fileFd is nil !\n")
+ fmt.Printf("log fileFd is nil !\n")
return len(buf), nil
}
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 805b37f..f1fa19a 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -162,7 +162,7 @@
func GetPolygons(cameraId string) []protomsg.CameraPolygon {
//var api dbapi.CameraApi
//data := api.FindAllPolygons()
- ////fmt.Println("鏌ュ埌鐨勬墍鏈夊尯鍩燂細", data)
+ ////logger.Info("鏌ュ埌鐨勬墍鏈夊尯鍩燂細", data)
//// 鏍规嵁id浠巑ap涓嬁鍒板尯鍩�
var cameraPolygons []protomsg.CameraPolygon
//for _, item := range data {
@@ -231,7 +231,7 @@
func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string) bool {
defer func() {
if err := recover(); err != nil {
- fmt.Println("姣斿瑙勫垯鏈夎", err.(string))
+ logger.Error("姣斿瑙勫垯鏈夎", err.(string))
}
}()
logger.Info("+++++++++++瑙勫垯寮�濮嬭繍琛�+++++++++++++++++褰撳墠瑙勫垯--锛�", (*groupRule).GroupText)
@@ -349,7 +349,7 @@
}
}
if flag {
- fmt.Println("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
+ logger.Info("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
// 濡傛灉鎴愬姛浜嗘垜搴旇鎵惧埌瑙勫垯涓秹鍙婂埌鐨剆dk锛岃褰曚笅浠栦滑鐨剆dkname
sdkName := ""
for j := 0; j < len(groupRule.Rules); j++ {
@@ -468,7 +468,7 @@
} else {
err := json.Unmarshal([]byte(areaPoints), &pts)
if err != nil {
- fmt.Println("json.Unmarshal閿欒", err)
+ logger.Error("json.Unmarshal閿欒", err)
panic("搴忓垪鍖栧潗鏍囧紓甯革紝绋嬪簭閫�鍑�")
}
}
@@ -481,7 +481,7 @@
// 绗竴姝ユ煡鍑鸿窡杩欎釜鎽勫儚鏈虹浉鍏崇殑group_id(澶ц鍒�)
//var api dbapi.CameraTaskArgsApi
//
- ////fmt.Println("鎵�鏈夎鍒�:", all)
+ ////logger.Info("鎵�鏈夎鍒�:", all)
//var taskArgs []*protomsg.TaskGroupArgs
//for _, camArg := range all {
// if camArg.CameraId == cameraId {
@@ -508,7 +508,7 @@
timeEle := TimeElement{N: 3, InitN: 3, GroupId: groupRule.GroupId} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌
//TimeEleList = make(map[string]timeElement)
TimeEleList[groupRule.GroupId] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互瑙勫垯缁刬d涓洪敭
- fmt.Println("---------------------------------------------鑱斿姩浠诲姟鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
+ logger.Info("---------------------------------------------鑱斿姩浠诲姟鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
// 寰楀嚭杩欑粍瀹屾暣瑙勫垯閲屾秹鍙婂埌鍑犱釜鎽勫儚鏈猴紝鍐冲畾鐫�鏁扮粍閲屾湁鍑犱釜缁撴瀯浣�,鍘婚噸娣诲姞鏂瑰紡
for j := 0; j < len(groupRule.Rules); j++ {
var flag1 bool = true
@@ -525,7 +525,7 @@
// 寰�鏁扮粍閲岃祴鍊�
isOk := RunRule(args, groupRule, taskId)
if isOk {
- fmt.Println("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负true")
+ logger.Info("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负true")
// 鏍规嵁cameraId鍘绘洿鏂版垨鑰呮彃鍏ョ粨鏋�,鐒跺悗鍒ゆ柇鏄惁鏁扮粍鏄惁鍙互寰楀嚭鎶ヨ鐨勭粨璁�
// 寰�鑱斿姩浠诲姟鐨勭粨鏋滄暟缁勯噷鏀惧�兼垨鏇存柊
for _, va := range timeEle.RuleResults {
@@ -575,10 +575,10 @@
}
}
} else {
- fmt.Println("鏁扮粍涓嶅渾婊′笉鎵撴爣绛�")
+ logger.Warn("鏁扮粍涓嶅渾婊′笉鎵撴爣绛�")
}
} else { // 娌℃湁鎶ヨ锛�
- fmt.Println("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负false")
+ logger.Info("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负false")
// 鎵�浠ヤ篃瑕佸幓缁撴灉鏁扮粍閲屾斁鍊兼垨鏇存柊
for _, va := range timeEle.RuleResults {
if args.CameraId != "" && va.CameraId == args.CameraId { // arg.CameraId 闅忎究鎵句竴涓暟鎹�
@@ -735,7 +735,7 @@
for k, _ := range TimeEleList {
if k == am.taskId+" "+am.sdkId+" "+am.areaId {
flag = false // 鏈夊氨缃负false
- fmt.Println("鏈夎繖涓畾鏃跺櫒锛屼笉鍐嶅垱寤轰簡锛�")
+ logger.Info("鏈夎繖涓畾鏃跺櫒锛屼笉鍐嶅垱寤轰簡锛�")
}
}
@@ -744,7 +744,7 @@
timeEle := TimeElement{N: timeLength, InitN: timeLength} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌
//TimeEleList = make(map[string]timeElement)
TimeEleList[am.taskId+" "+am.sdkId+" "+am.areaId] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互鎽勫儚鏈篿d鎷兼帴鍖哄煙id涓洪敭
- fmt.Println("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
+ logger.Info("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
}
}
}
@@ -769,7 +769,7 @@
func transferParameters(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
if rule.SdkId == am.sdkId && rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
if rule.SdkArgAlias == "targetNum" { // 濡傛灉鍙傛暟鏄鍖哄煙鍐呯洰鏍囨暟閲� 鍗硑olo 浜鸿劯涓嶄細鏈夋暟閲�
- //fmt.Println("寰楀嚭缁撴灉闃舵", "姣旇緝鐨勮鍒欐槸锛�", rule)
+ //logger.Info("寰楀嚭缁撴灉闃舵", "姣旇緝鐨勮鍒欐槸锛�", rule)
if rule.Operator == "" {
return LittleRuleResult{am.sdkName, strconv.Itoa(am.targetNum) + "" + rule.RuleWithPre, rule.Sort} // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺 姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
}
@@ -806,12 +806,12 @@
if rule.SdkArgAlias == "time_rule" { // 鍒ゆ柇鏄惁绗﹀悎鏃堕棿瑙勫垯
logger.Info("----------褰撳墠鏃堕棿瑙勫垯锛�---------", rule)
// 鏍规嵁鏀惧�煎瓧娈甸噷瀛樼殑鏃堕棿瑙勫垯鐨刬d鍘诲彟涓�涓〃閲屾煡闇�瑕佹瘮瀵圭殑鏃堕棿娈碉紙姣斿褰撳墠鏃堕棿鏄懆涓夛紝搴旀牴鎹尯鍩焛d鏌ュ嚭鍏跺懆涓夌殑鍑犱釜甯冮槻鏃堕棿娈碉紝鏁扮粍锛�
- //fmt.Println("鏃堕棿瑙勫垯鐨勬祴璇�")
+ //logger.Info("鏃堕棿瑙勫垯鐨勬祴璇�")
now := time.Now()
index := getIndexOfWeek(now.Weekday().String())
timeList := GetTimeById(rule.SdkArgValue, index)
logger.Info("褰撳ぉ鐨勬椂闂存闆嗗悎锛�----------", timeList)
- //fmt.Println("浠庢暟鎹簱涓煡鍑虹殑鏃堕棿瑙勫垯锛�", timeList)
+ //logger.Info("浠庢暟鎹簱涓煡鍑虹殑鏃堕棿瑙勫垯锛�", timeList)
// 鍒ゆ柇鍥剧墖鏁版嵁鐨勬椂闂存槸鍚︾鍚堝綋鍓嶈鍒� 鍦ㄤ竴涓嵆涓簍rue锛屽叏涓嶅湪涓篺alse
if rule.Operator == "satisfy" || rule.Operator == "==" { // 婊¤冻鎵�閫夌殑鏃堕棿瑙勫垯
@@ -824,7 +824,7 @@
formula1 := "'" + timeSlot.End + "'" + ">" + "'" + am.time + "'"
expression1, _ := govaluate.NewEvaluableExpression(formula1) // 寰楀埌鏁板鍏紡
result1, _ := expression1.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- //fmt.Println("鐪嬬湅杩欎袱灏婂ぇ绁�", result, result1)
+ //logger.Info("鐪嬬湅杩欎袱灏婂ぇ绁�", result, result1)
if result.(bool) && result1.(bool) {
flag = "true"
break
--
Gitblit v1.8.0