From a61cd237d45c7bec7a3e0cdf32ed33c49b41b73b Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 16 十二月 2019 17:41:12 +0800
Subject: [PATCH] update

---
 main.go |   84 ++++++++++++++++++++++++++++++-----------
 1 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/main.go b/main.go
index d7bcb34..263c91a 100644
--- a/main.go
+++ b/main.go
@@ -1,41 +1,79 @@
 package main
 
 import (
-	"fmt"
-	"log"
 	"net/http"
+    "flag"
 	_ "net/http/pprof"
-	"time"
-
-	"github.com/long/test/camera"
-	"github.com/long/test/sdk"
-	"github.com/long/test/tasktag"
-	"github.com/long/test/util"
-	//	"github.com/long/test/camera"
-	//	"github.com/long/test/sdk"
-	//	"github.com/long/test/tasktag"
+    "time"
+	"taskpubsub/camera"
+	"taskpubsub/sdk"
+	"taskpubsub/tasktag"
+	"taskpubsub/util"
+	"basic.com/valib/logger.git"
+	"github.com/spf13/viper"
 )
 
 var initchan = make(chan bool)
+var useShm bool
 
+const (
+	configFilePath  = "/opt/vasystem/config/"
+	configFileType = "yaml"
+	LOGBASEPATH = "/data/disk1/valog/taskpubsub.log"
+)
+
+var envirment = flag.String("e", "pro", "")
+
+func init(){
+	viper.SetConfigType(configFileType)
+	viper.SetConfigName(*envirment)
+	viper.AddConfigPath(configFilePath)
+	viper.AddConfigPath("./")
+	err := viper.ReadInConfig()
+	if err != nil {
+		logger.Error("viper.ReadInConfig() Error")
+		//panic(err)
+	}
+
+    var logFile = LOGBASEPATH
+	if viper.GetString("LogBasePath") != "" {
+		logFile = viper.GetString("LogBasePath") + "/taskpubsub.log"
+	}
+
+    // 鏃ュ織鍒濆鍖�
+	if viper.IsSet("LogLevel") &&
+		viper.GetInt("LogLevel") >= logger.PanicLevel &&
+		viper.GetInt("LogLevel") <= logger.DebugLevel {
+		logger.Config(logFile, viper.GetInt("LogLevel"))
+	}else{
+		logger.Config(logFile, logger.DebugLevel)
+	}
+	var logSaveDays    =    15
+    logger.SetSaveDays(logSaveDays)
+	logger.Info("loginit success !")
+	
+	flag.BoolVar(&useShm, "shm", false, "use shm for performance")
+}     
+        
 func main() {
+    flag.Parse()
+    time.Sleep(time.Second)
 
+	if useShm{
+		logger.Info("USE SHARE MEMORY")
+	}else{
+		logger.Info("USE PIPE")
+	}
 	// pprof 鐢ㄤ簬鍒嗘瀽鎬ц兘
 	go func() {
-		log.Println(http.ListenAndServe("0.0.0.0:6060", nil))
+		logger.Info(http.ListenAndServe("0.0.0.0:6061", nil))
 	}()
 
 	go util.Init(initchan)
 
-	fmt.Println("init ok !!!!, start sdk, task, camera init process ....", <-initchan)
-	fmt.Println()
-	fmt.Println()
-	fmt.Println()
-	fmt.Println()
-	sdk.Init()     //  鑾峰彇鎵�鏈夌畻娉昳d ,寤虹珛 sdk 涓婚锛� 寤虹珛sdk server(send, recv 杩愯)
-	tasktag.Init() // 鑾峰彇鎵�鏈変换鍔★紝寤虹珛浠诲姟鏍囩锛� 鍦ㄦ暟鎹繘鍏ユ椂锛� 鎵撴爣绛�
-	camera.Init()  //鑾峰彇cid, taskid, sdkid ,鍏崇郴
-	for {
-		time.Sleep(time.Second)
-	}
+	logger.Info("init ok !!!!, start sdk, task, camera init process ....", <-initchan)
+	sdk.Init(useShm)        //  鑾峰彇鎵�鏈夌畻娉昳d ,寤虹珛 sdk 涓婚锛� 寤虹珛sdk server(send, recv 杩愯)
+	tasktag.Init()   // 鑾峰彇鎵�鏈変换鍔★紝寤虹珛浠诲姟鏍囩锛� 鍦ㄦ暟鎹繘鍏ユ椂锛� 鎵撴爣绛�
+	camera.Init(useShm)   //鑾峰彇cid, taskid, sdkid ,鍏崇郴
+	select {}
 }

--
Gitblit v1.8.0