From 8c7dd4313817f6854461a64a7cadb7d970fb3e88 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 27 八月 2019 09:56:37 +0800
Subject: [PATCH] run nomally
---
main.go | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/main.go b/main.go
index 9a31d0d..53572a8 100644
--- a/main.go
+++ b/main.go
@@ -1,52 +1,57 @@
package main
import (
- "fmt"
- "log"
"net/http"
"flag"
_ "net/http/pprof"
"time"
+ "fmt"
- "github.com/long/test/camera"
- "github.com/long/test/sdk"
- "github.com/long/test/tasktag"
- "github.com/long/test/util"
- //"github.com/long/test/logger"
+ "taskpubsub/camera"
+ "taskpubsub/sdk"
+ "taskpubsub/tasktag"
+ "taskpubsub/util"
+ "taskpubsub/logger"
- // "github.com/long/test/camera"
- // "github.com/long/test/sdk"
- // "github.com/long/test/tasktag"
)
var initchan = make(chan bool)
-//func init(){
-// var logFile = "./taskpubsub.log"
-// var logSaveDays = 15
-//
-// // 鏃ュ織鍒濆鍖�
-// logger.Config(logFile, logger.DebugLevel)
-// logger.SetSaveDays(logSaveDays)
-// logger.Info("loginit success !")
-//}
+var useShm bool
+
+func init(){
+ var logFile = "./taskpubsub.log"
+ var logSaveDays = 15
+
+ // 鏃ュ織鍒濆鍖�
+ logger.Config(logFile, logger.InfoLevel)
+ logger.SetSaveDays(logSaveDays)
+ 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")
+ fmt.Println("USE SHARE MEMORY")
+ }else{
+ logger.Info("USE PIPE")
+ fmt.Println("USE PIPE")
+ }
// pprof 鐢ㄤ簬鍒嗘瀽鎬ц兘
go func() {
- log.Println(http.ListenAndServe("0.0.0.0:6061", 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()
- sdk.Init() // 鑾峰彇鎵�鏈夌畻娉昳d ,寤虹珛 sdk 涓婚锛� 寤虹珛sdk server(send, recv 杩愯)
+ logger.Info("init ok !!!!, start sdk, task, camera init process ....", <-initchan)
+ 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