From ba96922f40f82d12e9a5f4cfa4d887e78f460125 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 26 十二月 2019 15:23:17 +0800
Subject: [PATCH] update
---
main.go | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/main.go b/main.go
index 15a31ac..263c91a 100644
--- a/main.go
+++ b/main.go
@@ -5,31 +5,65 @@
"flag"
_ "net/http/pprof"
"time"
-
"taskpubsub/camera"
"taskpubsub/sdk"
"taskpubsub/tasktag"
"taskpubsub/util"
- "taskpubsub/logger"
-
+ "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(){
- var logFile = "./taskpubsub.log"
- var logSaveDays = 15
-
+ 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"
+ }
+
// 鏃ュ織鍒濆鍖�
- logger.Config(logFile, logger.InfoLevel)
+ 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 !")
+ logger.Info("loginit success !")
+
+ flag.BoolVar(&useShm, "shm", false, "use shm for performance")
}
-func main() {
+func main() {
flag.Parse()
time.Sleep(time.Second)
+ if useShm{
+ logger.Info("USE SHARE MEMORY")
+ }else{
+ logger.Info("USE PIPE")
+ }
// pprof 鐢ㄤ簬鍒嗘瀽鎬ц兘
go func() {
logger.Info(http.ListenAndServe("0.0.0.0:6061", nil))
@@ -38,8 +72,8 @@
go util.Init(initchan)
logger.Info("init ok !!!!, start sdk, task, camera init process ....", <-initchan)
- sdk.Init() // 鑾峰彇鎵�鏈夌畻娉昳d ,寤虹珛 sdk 涓婚锛� 寤虹珛sdk server(send, recv 杩愯)
+ sdk.Init(useShm) // 鑾峰彇鎵�鏈夌畻娉昳d ,寤虹珛 sdk 涓婚锛� 寤虹珛sdk server(send, recv 杩愯)
tasktag.Init() // 鑾峰彇鎵�鏈変换鍔★紝寤虹珛浠诲姟鏍囩锛� 鍦ㄦ暟鎹繘鍏ユ椂锛� 鎵撴爣绛�
- camera.Init() //鑾峰彇cid, taskid, sdkid ,鍏崇郴
+ camera.Init(useShm) //鑾峰彇cid, taskid, sdkid ,鍏崇郴
select {}
}
--
Gitblit v1.8.0