From ccb6685b1b28dcd7d376887504cd98b5cd410b44 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 12 三月 2024 17:56:01 +0800
Subject: [PATCH] 添加日志打印
---
config/config.go | 18 +++++++-
service/server.go | 17 +++++++-
main.go | 29 +++++++++-----
3 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/config/config.go b/config/config.go
index 0f86c14..de15231 100644
--- a/config/config.go
+++ b/config/config.go
@@ -7,12 +7,22 @@
)
type common struct {
- EsUrl string `mapstructure: "esUrl"`
- ServerUrl string `mapstructure: "serverUrl"`
- OrgName string `mapstructure: "orgName"`
+ EsUrl string `mapstructure:"esUrl"`
+ ServerUrl string `mapstructure:"serverUrl"`
+ OrgName string `mapstructure:"orgName"`
+ Interval int `mapstructure:"pushInterval"`
+}
+
+type logConfig struct {
+ Path string `mapstructure:"path"` //鏃ュ織瀛樺偍璺緞
+ Level int `mapstructure:"level"` //鏃ュ織绛夌骇
+ MaxSize int `mapstructure:"maxSize"` //鏃ュ織鏂囦欢澶у皬涓婇檺
+ MaxBackups int `mapstructure:"maxBackups"` //鏃ュ織鍘嬬缉鍖呬釜鏁�
+ MaxAge int `mapstructure:"maxAge"` //淇濈暀鍘嬬缉鍖呭ぉ鏁�
}
var Options = &common{}
+var LogConf = &logConfig{}
func Init() {
var err error
@@ -27,6 +37,8 @@
}
viper.UnmarshalKey("common", Options)
+ viper.UnmarshalKey("log", LogConf)
+
viper.WatchConfig()
viper.OnConfigChange(func(in fsnotify.Event) {
viper.UnmarshalKey("common", Options)
diff --git a/main.go b/main.go
index 62e1db2..b943870 100644
--- a/main.go
+++ b/main.go
@@ -6,6 +6,8 @@
"fmt"
"time"
+
+ "basic.com/valib/logger.git"
)
func init() {
@@ -14,22 +16,25 @@
func main() {
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)
<-done
- fmt.Println("绋嬪簭宸查��鍑�")
+ logger.Debug("绋嬪簭宸查��鍑�")
}
func runEvery(done chan<- bool) {
- ticker := time.NewTicker(10 * time.Second)
+ ticker := time.NewTicker(time.Duration(config.Options.Interval) * time.Second)
defer ticker.Stop()
for {
select {
case <-ticker.C:
- fmt.Println("寮�濮嬫墽琛屽嚱鏁般�傘�傘��")
+ logger.Debug("寮�濮嬫墽琛屾帹閫佷换鍔�")
doServer()
- fmt.Println("鏈鎵ц瀹屾瘯, 褰撳墠鎵�鏈夋暟鎹凡鍙戦�侊紒锛侊紒")
+ logger.Debug("鏈鎵ц瀹屾瘯, 褰撳墠鎵�鏈夋暟鎹凡鍙戦�侊紒锛侊紒")
time.Sleep(10 * time.Second)
}
}
@@ -40,32 +45,36 @@
for {
t, err := service.GetTotal()
if err != nil {
- fmt.Println(err)
+ logger.Error(err.Error())
+ return
}
total = t
- fmt.Println("鏈彂閫佺殑鏁版嵁鎬婚噺锛�", total)
+ logger.Debug("鏈彂閫佺殑鏁版嵁鎬婚噺锛�", total)
if total == 0 {
break
} else {
for {
connectStatus := service.ConnectControl()
- fmt.Println("connectStatus: ", connectStatus)
+ logger.Debug("鏈嶅姟绔繛鎺ョ姸鎬乧onnectStatus: ", connectStatus)
if connectStatus == true {
url := config.Options.ServerUrl
result, err1 := service.GetData()
if err1 != nil {
- fmt.Println(err1)
+ logger.Warn(err1.Error())
+ break
}
+
id, errs2 := service.SendData(result, url)
- fmt.Println("data id is: ", id)
+ logger.Debug("鎺ㄩ�佺殑鏁版嵁 id: ", id)
if errs2 == nil {
//delStatus := service.DeleteData(id)
markStatus := service.MarkData(id)
fmt.Println(markStatus)
+ logger.Debug("璁板綍鎺ㄩ�佺姸鎬� markStatus: ", markStatus)
}
break
} else {
- fmt.Println("5绉掑悗灏濊瘯閲嶆柊杩炴帴銆傘�傘��")
+ logger.Debug("鏈嶅姟绔繛鎺ュけ璐�,5绉掑悗灏濊瘯閲嶆柊杩炴帴銆傘�傘��")
time.Sleep(5 * time.Second)
}
}
diff --git a/service/server.go b/service/server.go
index 5f1eb69..2ad02fd 100644
--- a/service/server.go
+++ b/service/server.go
@@ -2,11 +2,13 @@
import (
"basic.com/pubsub/esutil.git"
+ "basic.com/valib/logger.git"
"bytes"
"data_msg_push_server/config"
"data_msg_push_server/model"
"data_msg_push_server/util"
"encoding/json"
+ "errors"
"fmt"
"io/ioutil"
"net/http"
@@ -107,14 +109,19 @@
for _, picMaxUrl := range source[0]["picMaxUrl"].([]interface{}) {
picMaxImageData, err := GetImageData("http://" + picMaxUrl.(string))
if err != nil {
- fmt.Println("鑾峰彇澶у浘鏁版嵁澶辫触:", err)
+ logger.Warn("鑾峰彇澶у浘鏁版嵁澶辫触:", err.Error())
continue
}
picMaxImages = append(picMaxImages, picMaxImageData)
}
- fmt.Println("鍥剧墖鏁版嵁鏁扮粍澶у皬:", len(picMaxImages))
}
}
+
+ if len(picMaxImages) == 0 {
+ return nil, errors.New("鑾峰彇澶у浘澶辫触, id:" + source[0]["id"].(string))
+ }
+
+ //fmt.Println("鍥剧墖鏁版嵁鏁扮粍澶у皬:", len(picMaxImages))
picSmImages := make([][]byte, 0) // 瀛樺偍鍥剧墖鏁版嵁鐨勬暟缁�
if source[0]["targetInfo"].(interface{}) != nil {
@@ -126,13 +133,17 @@
}
picSmImageData, err := GetImageData("http://" + picSmUrl)
if err != nil {
- fmt.Println("鑾峰彇鍥剧墖鏁版嵁澶辫触:", err)
+ fmt.Println("鑾峰彇灏忓浘鏁版嵁澶辫触:", err)
continue
}
picSmImages = append(picSmImages, picSmImageData)
}
}
+ if len(picSmImages) == 0 {
+ return nil, errors.New("鑾峰彇灏忓浘鏁版嵁澶辫触, id:" + source[0]["id"].(string))
+ }
+
// 涓婃姤鏈烘瀯鍚嶇О
source[0]["orgName"] = config.Options.OrgName
--
Gitblit v1.8.0