From 2bc5d0350ba5bb948aeaf54ecfa59f33eeb6004b Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 24 七月 2019 14:25:55 +0800
Subject: [PATCH] github.com/long/taskpubsub ==> taskpubsub

---
 main.go |   49 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/main.go b/main.go
index 659b34f..15a31ac 100644
--- a/main.go
+++ b/main.go
@@ -1,34 +1,45 @@
 package main
 
 import (
-	"fmt"
-	"log"
 	"net/http"
+    "flag"
 	_ "net/http/pprof"
+    "time"
 
-	"github.com/long/test/camera"
+	"taskpubsub/camera"
+	"taskpubsub/sdk"
+	"taskpubsub/tasktag"
+	"taskpubsub/util"
+    "taskpubsub/logger"
 
-	//	"github.com/long/test/httpclient"
-	"github.com/long/test/sdk"
-	"github.com/long/test/tasktag"
-	//"time"
 )
 
-func main() {
+var initchan = make(chan bool)
+
+func init(){
+    var logFile = "./taskpubsub.log"
+    var logSaveDays    =    15
+    
+    // 鏃ュ織鍒濆鍖�
+    logger.Config(logFile, logger.InfoLevel)
+    logger.SetSaveDays(logSaveDays)
+    logger.Info("loginit success !")
+}     
+        
+func     main() {
+    flag.Parse()
+    time.Sleep(time.Second)
+
 	// pprof 鐢ㄤ簬鍒嗘瀽鎬ц兘
 	go func() {
-		log.Println(http.ListenAndServe("192.168.1.124:6060", nil))
+		logger.Info(http.ListenAndServe("0.0.0.0:6061", nil))
 	}()
 
-	sdk.Init()     //  鑾峰彇鎵�鏈夌畻娉昳d ,寤虹珛 sdk 涓婚锛� 寤虹珛sdk server(send, recv 杩愯)
-	tasktag.Init() // 鑾峰彇鎵�鏈変换鍔★紝寤虹珛浠诲姟鏍囩锛� 鍦ㄦ暟鎹繘鍏ユ椂锛� 鎵撴爣绛�
-	camera.Init()  //鑾峰彇cid, taskid, sdkid ,鍏崇郴
+	go util.Init(initchan)
 
-	fmt.Println()
-	fmt.Println("===================================")
-	fmt.Println()
-
-	for {
-	}
-
+	logger.Info("init ok !!!!, start sdk, task, camera init process ....", <-initchan)
+	sdk.Init()        //  鑾峰彇鎵�鏈夌畻娉昳d ,寤虹珛 sdk 涓婚锛� 寤虹珛sdk server(send, recv 杩愯)
+	tasktag.Init()   // 鑾峰彇鎵�鏈変换鍔★紝寤虹珛浠诲姟鏍囩锛� 鍦ㄦ暟鎹繘鍏ユ椂锛� 鎵撴爣绛�
+	camera.Init()   //鑾峰彇cid, taskid, sdkid ,鍏崇郴
+	select {}
 }

--
Gitblit v1.8.0