From 3fc4fa8f8bf65030ee0969d73f958b11d90b7daf Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 17 十二月 2019 17:17:52 +0800
Subject: [PATCH] add log
---
tasktag/tasktag.go | 80 +++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/tasktag/tasktag.go b/tasktag/tasktag.go
index 5f6cb8e..dca8b78 100644
--- a/tasktag/tasktag.go
+++ b/tasktag/tasktag.go
@@ -1,67 +1,63 @@
package tasktag
import (
- "fmt"
"sync"
"basic.com/pubsub/protomsg.git"
- "github.com/long/test/util"
+ "basic.com/valib/logger.git"
+ "taskpubsub/util"
)
-//var TaskMapLab = make(map[string]*protomsg.TaskLabel)
-var TaskMapLab sync.Map
+var TaskLabelMap sync.Map
func Init() {
- fmt.Println("============= init tasktag info =====================")
- GenTaskMap()
+ logger.Info("============= init tasktag info =====================")
+ genTaskLabelMap()
go func(taskflag chan bool) {
for _ = range taskflag {
- GenTaskMap()
- fmt.Println("update task finished!")
+ genTaskLabelMap()
+ logger.Info("update task finished!")
}
-
}(util.TaskSdkflag)
-}
-
-func GenTaskMap() {
- var tls []protomsg.TaskLabel
- for _, taskSdk := range util.TaskSdks {
- var tl protomsg.TaskLabel
- tl.Taskid = taskSdk.Task.Taskid
- for _, sdkinfo := range taskSdk.Sdks {
- tl.Sdkids = append(tl.Sdkids, sdkinfo.Id)
- }
- tl.Index = int32(0)
- tls = append(tls, tl)
- }
-
- GenTasklab(tls)
-
- TaskMapLab.Range(func(k, v interface{}) bool {
- fmt.Println(k, v)
- return true
- })
-
- //for key, value := range TaskMapLab {
- // fmt.Println()
- // fmt.Println(key, value)
- //}
}
// 浠巗qlite 鎺ュ彛鎷垮埌鎵�鏈夌殑浠诲姟, 姣忎竴涓换鍔￠兘鏈夎嚜宸辩殑鍑犱釜绠楁硶
//浠� taskid 浣滀负key, 瀵瑰簲鐨勭畻娉曠粍鍚堜綔涓� value
-func GenTasklab(tasklab []protomsg.TaskLabel) {
- // TaskMapLab = nil
- // TaskMapLab = make(map[string]*protomsg.TaskLabel)
- TaskMapLab.Range(func(key interface{}, value interface{}) bool {
- TaskMapLab.Delete(key)
+func genTaskLabelMap() {
+ var newtls []protomsg.TaskLabel
+ for _, taskSdk := range util.TaskSdks {
+
+ var tl protomsg.TaskLabel
+ tl.Taskid = taskSdk.Task.Taskid
+ tl.Taskname = taskSdk.Task.Taskname
+
+ for _, sdkinfo := range taskSdk.Sdks {
+ sdkinfowithtask := new(protomsg.SdkmsgWithTask)
+ sdkinfowithtask.Ipcid = sdkinfo.IpcId
+ sdkinfowithtask.Sdktype = sdkinfo.SdkType
+ logger.Info("======sdkinfowithtask.Sdktype:", sdkinfowithtask.Sdktype)
+ sdkinfowithtask.Sdkdata = make([]byte, 1)
+ tl.Sdkinfos = append(tl.Sdkinfos, sdkinfowithtask)
+ }
+ tl.Index = int32(0)
+ newtls = append(newtls, tl)
+ }
+ updateTaskLabelMap(newtls)
+ TaskLabelMap.Range(func(k, v interface{}) bool {
+ logger.Info(k, v)
+ return true
+ })
+}
+
+func updateTaskLabelMap(taskLabel []protomsg.TaskLabel) {
+ TaskLabelMap.Range(func(key interface{}, value interface{}) bool {
+ TaskLabelMap.Delete(key)
return true
})
- for _, value := range tasklab {
+ for _, value := range taskLabel {
pv := value
- TaskMapLab.Store(value.Taskid, &pv)
- //TaskMapLab[value.Taskid] = &pv
+ TaskLabelMap.Store(value.Taskid, &pv)
}
}
--
Gitblit v1.8.0