From dc0e0daead178b80f569c7116e4524fee592f179 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 16 十二月 2019 14:01:13 +0800
Subject: [PATCH] 置为符从so中挪出来
---
main.go | 121 +++++++++++++++++++---------------------
1 files changed, 58 insertions(+), 63 deletions(-)
diff --git a/main.go b/main.go
index 38d7e69..7c8f61c 100644
--- a/main.go
+++ b/main.go
@@ -1,25 +1,27 @@
package main
import (
- "basic.com/dbapi.git"
- "basic.com/pubsub/protomsg.git"
- "basic.com/valib/deliver.git"
+
+ "flag"
+ "fmt"
+ "github.com/spf13/viper"
+ "sync"
"net/http"
_ "net/http/pprof"
"plugin"
+
+ //"github.com/spf13/viper"
+ //"basic.com/valib/logger.git"
+ "basic.com/valib/logger.git"
+ "github.com/panjf2000/ants/v2"
+
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/deliver.git"
"ruleprocess/insertdata"
"ruleprocess/labelFilter"
"ruleprocess/structure"
- "time"
-
- //"basic.com/valib/logger.git"
- "flag"
- "fmt"
- //"github.com/spf13/viper"
- logger "github.com/jeanphorn/log4go"
"ruleprocess/cache"
"ruleprocess/ruleserver"
- "sync"
)
var dbIp = flag.String("dbIp", "127.0.0.1", "dbserver ip")
@@ -33,22 +35,23 @@
flag.Parse()
// 鏃ュ織鍒濆鍖�
- 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)
+ structure.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)
// log4go
- logger.LoadConfiguration("./logger/log4go.json")
- logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒")
+ //logger.LoadConfiguration("./logger/log.xml")
+ logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒",logFile)
}
func main() {
//fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
+ defer ants.Release()
go func() {
http.ListenAndServe("0.0.0.0:8899",nil)
}()
@@ -56,17 +59,17 @@
wg := sync.WaitGroup{}
wg.Add(3)
- dbapi.Init(*dbIp, *dbPort)
go cache.Init(initchan, *dbIp, *surveyPort, *pubPort)
logger.Info("cache init completed!!!", <-initchan) //dbserver鍒濆鍖栧畬姣�
ruleserver.Init()
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()
+
}
func nReciever(url string, m deliver.Mode, count int) {
c := deliver.NewServer(m, url)
@@ -74,51 +77,44 @@
}
func nRecvImpl(c deliver.Deliver, index int) {
-
var msg []byte
+ //var wg1 sync.WaitGroup
+ //p,_ := ants.NewPool(20)
+ //syncCalculateSum := func() {
+ // Task(msg)
+ // wg1.Done()
+ //}
+ //wg1.Wait()
var err error
- //msgChan := make(chan []byte,100)
for {
- select {
- // case <-ctx.Done():
- // return
- default:
- msg, err = c.Recv()
- //msgChan <- msg
- if err != nil {
- logger.Info("recv error : ", err)
- fmt.Println("recv error : ", err)
- continue
- } else {
-
- //go func(msg []byte) {
- logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
- //logger.Warn(time.Now().Format("2006-01-02 15:04:05"))
- arg := structure.SdkDatas{}
- //paramFormat(msg, &arg)
- start := time.Now()
- m := CallParamFormat(msg, &arg)
- // 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
- ruleserver.Judge(&arg, &m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
- // 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
- resultMsg := structure.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
- ruleserver.GetAttachInfo(resultMsg.SdkMessage)
- ruleEnd := time.Since(start)
- logger.Debug("瑙勫垯鍒ゆ柇瀹屾墍鐢ㄦ椂闂达細", ruleEnd)
- // 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
- insertdata.InsertToEs(resultMsg)
- esEnd := time.Since(start)
- logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", esEnd)
- //浜嬩欢鎺ㄩ��
- labelFilter.PushSomthing(resultMsg)
- //}(msg)
- }
+ msg, err = c.Recv()
+ if err == nil {
+ //wg1.Add(1)
+ //_ = p.Submit(syncCalculateSum)
+ Task(msg)
+ } else {
+ //fmt.Println(err)
+ //logger.Info(err)
}
}
}
+func Task (msg []byte) {
+ arg := structure.SdkDatas{}
+ //start := time.Now()
+ m := CallParamFormat(msg, &arg)
+ // 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
+ ruleserver.Judge(&arg, &m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
+ // 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
+ resultMsg := structure.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
+ ruleserver.GetAttachInfo(resultMsg.SdkMessage)
+ // 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
+ insertdata.InsertToEs(resultMsg)
+ //浜嬩欢鎺ㄩ��
+ labelFilter.PushSomthing(resultMsg)
+}
func CallParamFormat(msg []byte, args *structure.SdkDatas) protomsg.SdkMessage{
- logger.Info("鍛煎彨涓棿浠舵牸寮忓寲鏁版嵁")
+ //logger.Info("鍛煎彨涓棿浠舵牸寮忓寲鏁版嵁")
p,err := plugin.Open("./algorithm/middleware.so")
if err != nil {
panic(err)
@@ -131,4 +127,3 @@
return mess
}
-// 5鍒嗛挓鏀朵笉鍒版秷鎭潃姝昏嚜宸遍噸鍚�
--
Gitblit v1.8.0