commit

amd64/dispatch_server/package/service/run_task.go

@@ -6,7 +6,6 @@ import (
 	"cicv-data-closedloop/amd64/dispatch_server/package/global"
 	"cicv-data-closedloop/amd64/dispatch_server/package/infra"
 	"cicv-data-closedloop/amd64/dispatch_server/package/util"
-	"cicv-data-closedloop/common/config/c_log"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -159,7 +158,7 @@ func RunWaitingCluster() {
 		algorithmImageName := infra.ApplicationYaml.K8s.RegistryUri + "/cicvdcl_" + util.MD5HashShort(algorithmTarName)
 		err = infra.GlobalOssBucket.GetObjectToFile(firstTaskCache.AlgorithmObjectKey, algorithmTarPath)
 		if err != nil {
-			c_log.GlobalLogger.Error("下载oss上的算法镜像 "+firstTaskCache.AlgorithmObjectKey+" 失败，错误信息为：", err)
+			infra.GlobalLogger.Error("下载oss上的算法镜像 "+firstTaskCache.AlgorithmObjectKey+" 失败，错误信息为：", err)
 			time.Sleep(time.Duration(2) * time.Second)
 			continue
 		}
@@ -167,14 +166,14 @@ func RunWaitingCluster() {
 		_, s, err := util.Execute("docker", "import", algorithmTarPath, algorithmImageName)
 		_, s, err = util.Execute("docker", "push", algorithmImageName)
 		if err != nil {
-			c_log.GlobalLogger.Errorf("导入算法镜像 %v 为 %v 失败，执行结果为：%v，错误信息为：%v", algorithmTarPath, algorithmImageName, s, err)
+			infra.GlobalLogger.Errorf("导入算法镜像 %v 为 %v 失败，执行结果为：%v，错误信息为：%v", algorithmTarPath, algorithmImageName, s, err)
 			time.Sleep(time.Duration(2) * time.Second)
 			continue
 		}
-		c_log.GlobalLogger.Infof("导入算法镜像 %v 为 %v 成功，执行结果为：%v", algorithmTarPath, algorithmImageName, s)
+		infra.GlobalLogger.Infof("导入算法镜像 %v 为 %v 成功，执行结果为：%v", algorithmTarPath, algorithmImageName, s)
 		err = util.RemoveFile(algorithmTarPath)
 		if err != nil {
-			c_log.GlobalLogger.Errorf("删除算法镜像文件 %v 失败，错误信息为：%v", algorithmTarPath, err)
+			infra.GlobalLogger.Errorf("删除算法镜像文件 %v 失败，错误信息为：%v", algorithmTarPath, err)
 		}
 		// --------------- 启动 k8s pod ---------------
 		podName := "project-" + projectId + "-" + util.NewShortUUID()