From 5ba3bfd0ebcb390e3a26136dde5a3bbdd60179b6 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 27 十一月 2019 20:01:42 +0800
Subject: [PATCH] ---
---
restart | 2 +-
main.go | 10 +++++++---
labelFilter/ruleForLabel.go | 4 +---
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 08d675b..4323b0b 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -321,16 +321,14 @@
// 璋冪敤鐩爣鏈嶅姟鍣ㄧ殑鎻掑叆鎺ュ彛
func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg) {
for _, url := range urls {
- logger.Debug("鐪嬬湅鎺ㄩ�佸湴鍧�锛�",url.Url)
+ logger.Debug("鎺ㄩ�佸湴鍧�锛�",url.Url)
bytes,err1 := proto.Marshal(data)
if err1 != nil {
logger.Info("搴忓垪鍖栧け璐ワ細",err1)
}
if _, ok := urlPool[url.Url] ; ok {
urlPool[url.Url] <- bytes
- logger.Info("chan淇℃伅鑰岋細 ", urlPool[url.Url])
}
- logger.Info("chan淇℃伅浠ワ細 ", urlPool[url.Url])
}
diff --git a/main.go b/main.go
index c466ef2..e20d21f 100644
--- a/main.go
+++ b/main.go
@@ -16,7 +16,7 @@
"flag"
"fmt"
"github.com/spf13/viper"
- //log "github.com/jeanphorn/log4go"
+ log "github.com/jeanphorn/log4go"
"ruleprocess/cache"
"ruleprocess/ruleserver"
"sync"
@@ -63,6 +63,8 @@
labelFilter.Init()
go ruleserver.TimeTicker()
go ruleserver.StartServer()
+ //timeEle := ruleserver.TimeElement{N: 300, InitN: 300}
+ //ruleserver.TimeEleList["ruleprocess"] = &timeEle
nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
wg.Wait()
}
@@ -91,7 +93,7 @@
//go func(msg []byte) {
logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
- //log.Warn(time.Now().Format("2006-01-02 15:04:05"))
+ log.Warn(time.Now().Format("2006-01-02 15:04:05"))
arg := structure.SdkDatas{}
//paramFormat(msg, &arg)
start := time.Now()
@@ -116,7 +118,7 @@
}
func CallParamFormat(msg []byte, args *structure.SdkDatas) protomsg.SdkMessage{
- logger.Info("鍛煎彨涓棿浠舵牸寮忓寲鏁版嵁")
+ log.Info("鍛煎彨涓棿浠舵牸寮忓寲鏁版嵁")
p,err := plugin.Open("./algorithm/middleware.so")
if err != nil {
panic(err)
@@ -128,3 +130,5 @@
mess := f.(func(msg []byte, args *structure.SdkDatas)(protomsg.SdkMessage))(msg,args)
return mess
}
+
+// 5鍒嗛挓鏀朵笉鍒版秷鎭潃姝昏嚜宸遍噸鍚�
diff --git a/restart b/restart
index 0702563..3ff829a 100755
--- a/restart
+++ b/restart
@@ -2,7 +2,7 @@
while true
do
- number=`ps -ef | grep "ruleprocess" | grep -v "restartPanlei" |grep -v "grep" | wc -l`
+ number=`ps -ef | grep "ruleprocess" |grep -v "grep" | wc -l`
echo $number
if [ $number -eq 0 ];then
cd /home/basic/workspace/gitblit/ruleprocess
--
Gitblit v1.8.0