From 47b5f415a971e89038366048af57859c05d67bad Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 24 九月 2019 20:19:45 +0800
Subject: [PATCH] 阈值参数名字

---
 main.go |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/main.go b/main.go
index 8969110..9378715 100644
--- a/main.go
+++ b/main.go
@@ -4,9 +4,10 @@
 	"basic.com/dbapi.git"
 	"basic.com/pubsub/protomsg.git"
 	"basic.com/valib/deliver.git"
+	"net/http"
+	_ "net/http/pprof"
 	"ruleprocess/insertdata"
 	"ruleprocess/util"
-	"runtime"
 	"time"
 
 	//"bufio"
@@ -22,6 +23,7 @@
 	"ruleprocess/cache"
 	"ruleprocess/ruleserver"
 	"sync"
+	"github.com/spf13/viper"
 )
 
 var dbIp = flag.String("dbIp", "127.0.0.1", "dbserver ip")
@@ -29,22 +31,34 @@
 var surveyPort = flag.Int("surveyPort", 40007, "survey port") //蹇冭烦
 var pubPort = flag.Int("pubPort", 50007, "pubsub port")       //鏁版嵁鏇存柊
 var initchan = make(chan bool)
+var env =  flag.String("env","pro","env set")
 
 func init() {
+	flag.Parse()
 	// 鏃ュ織鍒濆鍖�
-	logger.Config("./info.log", logger.DebugLevel)
-	logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒")
 
+	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.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒")
 }
 func main() {
+	//fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
+	go func() {
+		http.ListenAndServe("0.0.0.0:8899",nil)
+	}()
 	flag.Parse()
 	wg := sync.WaitGroup{}
-	wg.Add(2)
+	wg.Add(3)
 
 	dbapi.Init(*dbIp, *dbPort)
 	go cache.Init(initchan, *dbIp, *surveyPort, *pubPort)
 	logger.Info("cache init completed!!!", <-initchan) //dbserver鍒濆鍖栧畬姣�
-	//fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
 	ruleserver.Init()
 	go ruleserver.TimeTicker()
 	go ruleserver.StartServer()
@@ -73,9 +87,9 @@
 				fmt.Println("recv error : ", err)
 				continue
 			} else {
-				runtime.GOMAXPROCS(runtime.NumCPU())
-				logger.Debug("浣跨敤鐨刢pu涓暟锛�",runtime.NumCPU())
-				go func(msg []byte) {
+				//runtime.GOMAXPROCS(runtime.NumCPU())
+				//logger.Debug("浣跨敤鐨刢pu涓暟锛�",runtime.NumCPU())
+				//go func(msg []byte) {
 					logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
 					arg := ruleserver.SdkDatas{}
 					//paramFormat(msg, &arg)
@@ -91,7 +105,7 @@
 					logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", time.Since(start))
 					//浜嬩欢鎺ㄩ��
 					//go labelFilter.Judge(resultMsg)
-				}(msg)
+				//}(msg)
 			}
 		}
 	}
@@ -113,7 +127,7 @@
 func paramFormat(msg []byte, args *ruleserver.SdkDatas) protomsg.SdkMessage {
 	defer func() {
 		if err := recover(); err != nil {
-			logger.Info("瑙e寘杩囩▼鐨勯敊璇�", err.(string))
+			logger.Info("瑙e寘杩囩▼鐨勫紓甯告崟鑾�", err.(string))
 		}
 
 	}()
@@ -125,7 +139,7 @@
 	}
 
 	// 鍏堣繘琛屼竴涓嬭拷韪�
-	//ruleserver.FaceIsSame(&m)
+	ruleserver.FaceIsSame(&m)
 	args.CameraId = m.Cid
 	args.TaskId = m.Tasklab.Taskid
 	// 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�

--
Gitblit v1.8.0