merge module

panlei

2019-11-07 5ae97eebd0dfcaad32e92f9df7b7f73caad922bf

 main.go

@@ -7,20 +7,16 @@
   "net/http"
   _ "net/http/pprof"
   "ruleprocess/insertdata"
   "ruleprocess/labelFilter"
   "ruleprocess/structure"
   "ruleprocess/util"
   "time"

   //"bufio"
   //"bytes"
   "basic.com/valib/logger.git"
   "flag"
   "fmt"
   "github.com/golang/protobuf/proto"
   "ruleprocess/logger"
   //"gocv.io/x/gocv"
   //"image"
   //"image/color"
   //"os"
   "github.com/spf13/viper"
   "ruleprocess/cache"
   "ruleprocess/ruleserver"
   "sync"
@@ -31,12 +27,22 @@
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.SetSaveDays(7)
   logger.Info("日志初始化成功！")
}
func main() {
   //fmt.Println("缓存初始化完成",<- initchan)//dbserver初始化完毕
@@ -51,6 +57,7 @@
   go cache.Init(initchan, *dbIp, *surveyPort, *pubPort)
   logger.Info("cache init completed!!!", <-initchan) //dbserver初始化完毕
   ruleserver.Init()
   labelFilter.Init()
   go ruleserver.TimeTicker()
   go ruleserver.StartServer()
   nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
@@ -90,12 +97,15 @@
               ruleserver.Judge(&arg, &m) // 把sdkMessage传进去，方便缓存数据时拼出一个resultMag
               // 把arg里的打的标签拿出来给m再封装一层
               resultMsg := structure.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
               logger.Debug("规则判断完所用时间：", time.Since(start))
               ruleserver.GetAttachInfo(resultMsg.SdkMessage)
               ruleEnd := time.Since(start)
               logger.Debug("规则判断完所用时间：", ruleEnd)
               // 将打完标签的数据插入到ES
               insertdata.InsertToEs(resultMsg)
               logger.Debug("插入完Es所用时间：", time.Since(start))
               esEnd := time.Since(start)
               logger.Debug("插入完Es所用时间：", esEnd)
               //事件推送
               //go labelFilter.Judge(resultMsg)
               labelFilter.PushSomthing(resultMsg)
            //}(msg)
         }
      }
@@ -118,7 +128,7 @@
func paramFormat(msg []byte, args *structure.SdkDatas) protomsg.SdkMessage {
   defer func() {
      if err := recover(); err != nil {
         logger.Info("解包过程的错误", err.(string))
         logger.Info("解包过程的异常捕获", err.(string))
      }

   }()
@@ -172,7 +182,7 @@
            for _, info := range yoloParam.Infos {
               if info.Typ == 0 {
                  //logger.Debug("-------------yolo的坐标有几个",info.RcObj)
                  photoMap := structure.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob) * 100, IsYolo: true}
                  photoMap := structure.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob) * 100, IsYolo: true,Id:info.ObjID}
                  arg.Photo = append(arg.Photo, photoMap)
                  yoloNum++
               }