Przeglądaj źródła

修复 AppDeployServiceImpl#updateAppDeployingNode 方法 bug

reghao 1 rok temu
rodzic
commit
1f85b6eee2

+ 11 - 3
mgr/src/main/java/cn/reghao/devops/mgr/mgr/app/service/impl/AppDeployServiceImpl.java

@@ -2,6 +2,7 @@ package cn.reghao.devops.mgr.mgr.app.service.impl;
 
 import cn.reghao.devops.common.docker.model.Config;
 import cn.reghao.devops.common.msg.constant.PackType;
+import cn.reghao.devops.mgr.admin.sys.service.SysMessageService;
 import cn.reghao.devops.mgr.mgr.app.db.query.AppBuildQuery;
 import cn.reghao.devops.mgr.mgr.app.db.query.AppDeployQuery;
 import cn.reghao.devops.mgr.mgr.app.db.repository.AppDeployingRepository;
@@ -46,11 +47,12 @@ public class AppDeployServiceImpl implements AppDeployService {
     private final MachineQuery machineQuery;
     private final AppBuildQuery appBuildQuery;
     private final AppDeployQuery appDeployQuery;
+    private SysMessageService sysMessageService;
 
     public AppDeployServiceImpl(AppDeployConfigRepository deployConfigRepository, AppDeployingRepository deployingRepository,
                                 DeployLogRepository deployLogRepository, BuildDeployNotify buildDeployNotify,
                                 MachineQuery machineQuery, AppBuildQuery appBuildQuery,
-                                AppDeployQuery appDeployQuery) {
+                                AppDeployQuery appDeployQuery, SysMessageService sysMessageService) {
         this.deployConfigRepository = deployConfigRepository;
         this.deployingRepository = deployingRepository;
         this.deployLogRepository = deployLogRepository;
@@ -58,6 +60,7 @@ public class AppDeployServiceImpl implements AppDeployService {
         this.machineQuery = machineQuery;
         this.appBuildQuery = appBuildQuery;
         this.appDeployQuery = appDeployQuery;
+        this.sysMessageService = sysMessageService;
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -330,7 +333,9 @@ public class AppDeployServiceImpl implements AppDeployService {
                     appDeployingNode.setRunning(statResult.getRunning());
                     appDeployingNode.setStartTime(statResult.getStartTime());
                     appDeployingNode.setPid(statResult.getPid());
-                    appDeployingNode.setLastCheck(DateTimeConverter.localDateTime(statResult.getResult().getTimestamp()));
+                    if (statResult.getResult() != null) {
+                        appDeployingNode.setLastCheck(DateTimeConverter.localDateTime(statResult.getResult().getTimestamp()));
+                    }
                 }
             });
 
@@ -341,7 +346,10 @@ public class AppDeployServiceImpl implements AppDeployService {
             if (machineHost != null) {
                 machineIpv4 = machineHost.getMachineIpv4();
             }
-            log.info("{} -> {} not exist", machineIpv4, appId);
+
+            String title = "App Not Exist";
+            String content = String.format("%s -> %s not exist", machineIpv4, appId);
+            sysMessageService.putSysMessage(title, content);
         }
     }
 }