From f993d1206315fb3e9eb59dbd001aa373008e2d2b Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 17 六月 2020 14:45:52 +0800
Subject: [PATCH] fix
---
.gitignore | 3 ++-
go.mod | 2 +-
server.go | 6 +++---
esutil/EsClient.go | 12 ++++++++----
logs/error.log | 2 +-
5 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9b9a727..0af1298 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
.idea
-test.exe
\ No newline at end of file
+test.exe
+logs
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index bcf3c83..c625f86 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -27,7 +27,7 @@
resp, err := client.Do(req)
if err != nil {
- return err, nil
+ return err, nil
}
defer resp.Body.Close()
@@ -47,7 +47,7 @@
}
// 鏄惁闇�瑕� 瑙ｆ瀽 es 杩斿洖鐨� source
if isSource {
- dat, ok := dat["hits"].(map[string]interface{})
+ dat, ok := dat["hits"].(map[string]interface{})
if !ok {
return errors.New("data is not type of map[string]interface{}"), nil
}
@@ -75,12 +75,14 @@
tB, err := json.Marshal(source["targetInfo"])
if err != nil {
- continue
+ log.Log.Infoln("err:", err)
+ continue
}
tiArr := []TargetInfo{}
err = json.Unmarshal(tB, &tiArr)
if err !=nil {
+ log.Log.Infoln("err:", err)
continue
}
if len(tiArr) > 0 {
@@ -220,7 +222,7 @@
var filterArr []string
//鏄惁鏌ユ姤璀︽暟鎹�
if ishub == "hub" {
- filterArr = append(filterArr,"{\"term\":{\"alarmRules.alarmLevel.raw\":\"涓�绾"}}")
+ filterArr = append(filterArr,"{\"term\":{\"alarmRules.alarmLevel.raw\":\"浜岀骇\"}}")
}
filterArr = append(filterArr, "{\"range\":{\"picDate\":{\"gte\":\"now+8h-"+preSec+"s\",\"lt\":\"now+8h\"}}}")
@@ -238,7 +240,9 @@
log.Log.Errorln("GetEsDataReq err:", err)
return nil
}
+ log.Log.Infoln("tokenRes:", tokenRes)
jsonstring, _ := json.Marshal(tokenRes)
+ log.Log.Infoln("len(result):", len(jsonstring))
if len(jsonstring) <= 26 {
return nil
}
diff --git a/go.mod b/go.mod
index 21eafe7..97c9b20 100644
--- a/go.mod
+++ b/go.mod
@@ -8,5 +8,5 @@
github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
github.com/sirupsen/logrus v1.4.2
github.com/spf13/viper v1.4.0
- github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271 // indirect
+ github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271
)
diff --git a/logs/error.log b/logs/error.log
index d847d79..92e4d3d 120000
--- a/logs/error.log
+++ b/logs/error.log
@@ -1 +1 @@
-logs/error.log.201905280000
\ No newline at end of file
+logs/error.log.202006170000
\ No newline at end of file
diff --git a/server.go b/server.go
index e4ec3ee..dead683 100644
--- a/server.go
+++ b/server.go
@@ -13,7 +13,7 @@
)
var addr = flag.String("addr", "0.0.0.0", "The address to listen to")
-var Eurl = flag.String("eurl", "http://172.16.50.241:9200/", "The port to listen on")
+var Eurl = flag.String("eurl", "http://192.168.20.10:9200/", "The port to listen on")
//var Picurl = flag.String("picurl", "http://58.118.225.79:41242/", "picture url")
var port = flag.Int("port", 6000, "The port to listen on")
@@ -23,7 +23,7 @@
var IsHub = flag.String("hub", "hub", "hub is personIsHub=1")
var Size = flag.Int("size", 100, "size default is 100")
var env = flag.String("env", "config", "env set")
-var mqIp = flag.String("mqIp", "172.17.50.245", "default mq ip")
+var mqIp = flag.String("mqIp", "192.168.20.10", "default mq ip")
var mqPort = flag.Int("mqPort", 5672, "default mq port")
var mqUser = flag.String("mqUser", "basic", "default rabbitmq user")
var mqPass = flag.String("mqPass", "basic", "default rabbitmq pass")
@@ -94,4 +94,4 @@
lastTime = curTime
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0