Browse Source

dagent - milestone
将 StatusResult 的 isRunning 字段修改为 status

reghao 4 years ago
parent
commit
c2b667402f

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/msg/rpc/dto/app/StatusResult.java

@@ -18,7 +18,7 @@ public class StatusResult implements Serializable {
     private String machineId;
     private String appId;
     private String commitId;
-    private Boolean isRunning;
+    private String status;
     private LocalDateTime startTime;
     private Integer pid;
 }

+ 4 - 1
dagent/src/main/java/cn/reghao/autodop/dagent/app/DockerAppServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.reghao.autodop.dagent.app;
 
 import cn.reghao.autodop.common.machine.Machine;
+import cn.reghao.autodop.common.msg.pub.dto.node.constant.NodeStatus;
 import cn.reghao.autodop.common.msg.rpc.dto.app.StatusResult;
 import cn.reghao.autodop.common.msg.rpc.dto.app.DeployParam;
 import cn.reghao.autodop.common.dagent.app.log.AppLogArgs;
@@ -64,13 +65,15 @@ public class DockerAppServiceImpl implements AppService {
 
         State state = containerInfo.getState();
         boolean isRunning = state.isRunning();
-        appStatus.setIsRunning(isRunning);
         if (isRunning) {
+            appStatus.setStatus(NodeStatus.Online.name());
             appStatus.setStartTime(DateTimeConverter.localDateTime(state.getStartedAt()));
             appStatus.setPid(state.getPid());
         } else {
+            appStatus.setStatus(NodeStatus.Offline.name());
             appStatus.setPid(-1);
         }
+
         return appStatus;
     }