From 1ca4879df9cc3c22181b2a200aa4b793116d3d35 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期六, 19 十月 2024 16:23:55 +0800
Subject: [PATCH] fix id

---
 main.go |   72 +++++++++++++++++------------------
 1 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/main.go b/main.go
index d173e44..a71a4de 100644
--- a/main.go
+++ b/main.go
@@ -3,82 +3,80 @@
 import (
 	"data_msg_push_server/config"
 	"data_msg_push_server/service"
-	"flag"
-	"fmt"
+
 	"time"
+
+	"basic.com/valib/logger.git"
 )
 
-var env = flag.String("config", "config", "read storage info")
-
 func init() {
-	config.Init(*env)
+	config.Init()
 }
 
 func main() {
-	fmt.Println("hello!!!")
 	done := make(chan bool)
+	// 鏃ュ織鍒濆鍖�
+	var logFile = config.LogConf.Path + "esSyncClient.log"
+	logger.InitLogger(logFile, config.LogConf.Level, config.LogConf.MaxSize, config.LogConf.MaxBackups, config.LogConf.MaxAge)
 
 	go runEvery(done)
-	//result,err  := service.GetData()
-	//if err != nil {
-	//	fmt.Println(err)
-	//}
-	//if result != nil{
-	//
-	//}
 	<-done
-	fmt.Println("绋嬪簭宸查��鍑�")
-	//fmt.Println(res)
-	//fmt.Println(err)
-
+	logger.Debug("绋嬪簭宸查��鍑�")
 }
 
-func runEvery(done chan<- bool){
-	ticker := time.NewTicker(10 * time.Second)
+func runEvery(done chan<- bool) {
+	ticker := time.NewTicker(time.Duration(config.Options.Interval) * time.Second)
 	defer ticker.Stop()
 
-	for{
+	for {
 		select {
 		case <-ticker.C:
-			fmt.Println("寮�濮嬫墽琛屽嚱鏁般�傘�傘��")
+			logger.Debug("寮�濮嬫墽琛屾帹閫佷换鍔�")
 			doServer()
-			fmt.Println("鏈鎵ц瀹屾瘯, 褰撳墠鎵�鏈夋暟鎹凡鍙戦�侊紒锛侊紒")
+			logger.Debug("鏈鎵ц瀹屾瘯, 褰撳墠鎵�鏈夋暟鎹凡鍙戦�侊紒锛侊紒")
 			time.Sleep(10 * time.Second)
 		}
 	}
 }
 
-func doServer()  {
+func doServer() {
 	total := 0
+	retryCount := 0
 	for {
-		t,err := service.GetTotal()
+		t, err := service.GetTotal()
 		if err != nil {
-			fmt.Println(err)
+			logger.Error(err.Error())
+			return
 		}
 		total = t
-		fmt.Println("鏈彂閫佺殑鏁版嵁鎬婚噺锛�", total)
-		if total == 0 {
+		logger.Debugf("鏈彂閫佺殑鏁版嵁鎬婚噺:%d, 閲嶈瘯娆℃暟:%d", total, retryCount)
+		if total == 0 || retryCount > 10 {
 			break
 		} else {
 			for {
 				connectStatus := service.ConnectControl()
-				fmt.Println("connectStatus: ",connectStatus)
+				logger.Debug("鏈嶅姟绔繛鎺ョ姸鎬乧onnectStatus: ", connectStatus)
 				if connectStatus == true {
-					url := config.ServUrls.ServerUrl
+					url := config.Options.ServerUrl
 					result, err1 := service.GetData()
 					if err1 != nil {
-						fmt.Println(err1)
+						logger.Warn("鑾峰彇es鏁版嵁澶辫触,", err1.Error())
+						return
 					}
-					id, errs2 := service.SendData(result, url)
-					fmt.Println("data id is: ",id)
-					if errs2 == nil{
-						//delStatus := service.DeleteData(id)
-						markStatus := service.MarkData(id)
-						fmt.Println(markStatus)
+
+					id, err := service.SendData(result, url)
+					logger.Debug("鎺ㄩ�佺殑鏁版嵁 id: ", result.PicId)
+					if err == nil {
+						markStatus := service.MarkData(result.PicId)
+						logger.Debug("璁板綍鎺ㄩ�佺姸鎬� markStatus: ", markStatus)
+					} else {
+						logger.Debugf("鎺ㄩ�佺殑鏁版嵁澶辫触 id: %s, err:%s", id, err.Error())
+						time.Sleep(5 * time.Second)
+						retryCount += 1
 					}
 					break
 				} else {
-					fmt.Println("5绉掑悗灏濊瘯閲嶆柊杩炴帴銆傘�傘��")
+					logger.Debug("鏈嶅姟绔繛鎺ュけ璐�, 5绉掑悗灏濊瘯閲嶆柊杩炴帴銆傘�傘��")
 					time.Sleep(5 * time.Second)
 				}
 			}

--
Gitblit v1.8.0