loki，cortex增加对start及stop命令执行错误的提示信息处理

3 files changed, 32 insertions, 8 deletions

diff --git a/src/main/java/net/geedge/confagent/controller/CortexController.java b/src/main/java/net/geedge/confagent/controller/CortexController.java
index abd1add..36fd243 100644
--- a/src/main/java/net/geedge/confagent/controller/CortexController.java
+++ b/src/main/java/net/geedge/confagent/controller/CortexController.java
@@ -78,15 +78,26 @@ public class CortexController extends BaseController{
         //重启服务cortex
         if(Tool.StrUtil.isNotBlank(stopCmd)) {
         	log.info("stop cortex:"+stopCmd);
-        	Tool.RuntimeUtil.exec(stopCmd);
+        	try {
+        		Tool.RuntimeUtil.exec(stopCmd);
+        	}catch(Exception e) {
+        		log.error(e);
+        		return R.error(RCode.STOP_CMD_ERROR);
+        	}
         	log.info("stop cortex:"+stopCmd+"  end");
         }
         Tool.ThreadUtil.sleep(1000);
         if(Tool.StrUtil.isNotBlank(startCmd)) {
         	log.info("start cortex:"+startCmd);
-//        	String[] b={"sh","-c",startCmd};
-//        	Tool.RuntimeUtil.exec(b);
-        	Tool.RuntimeUtil.exec(startCmd);
+        	try {
+//            	String[] b={"sh","-c",startCmd};
+//            	Tool.RuntimeUtil.exec(b);
+            	Tool.RuntimeUtil.exec(startCmd);
+        	}catch(Exception e) {
+        		log.error(e);
+        		return R.error(RCode.START_CMD_ERROR);
+        	}
+
         	log.info("start cortex:"+startCmd+"  end");
         }
 
diff --git a/src/main/java/net/geedge/confagent/controller/LokiController.java b/src/main/java/net/geedge/confagent/controller/LokiController.java
index 667d78a..02144c5 100644
--- a/src/main/java/net/geedge/confagent/controller/LokiController.java
+++ b/src/main/java/net/geedge/confagent/controller/LokiController.java
@@ -77,15 +77,25 @@ public class LokiController extends BaseController{
             Tool.YamlUtil.writeAsMap(lokiConf,lokiConfPath);
             if(Tool.StrUtil.isNotBlank(stopCmd)) {
             	log.info("stop loki:"+stopCmd);
-            	Tool.RuntimeUtil.exec(stopCmd);
+            	try {
+            		Tool.RuntimeUtil.exec(stopCmd);
+            	}catch(Exception e) {
+            		log.error(e);
+            		return R.error(RCode.STOP_CMD_ERROR);
+            	}
             	log.info("stop loki:"+stopCmd+"  end");
             }
             Tool.ThreadUtil.sleep(1000);
             if(Tool.StrUtil.isNotBlank(startCmd)) {
             	log.info("start loki:"+startCmd);
-//            	String[] b={"sh","-c",startCmd};
-//            	Tool.RuntimeUtil.exec(b);
-            	Tool.RuntimeUtil.exec(startCmd);
+            	try {
+//                	String[] b={"sh","-c",startCmd};
+//                	Tool.RuntimeUtil.exec(b);
+                	Tool.RuntimeUtil.exec(startCmd);
+            	}catch(Exception e) {
+            		log.error(e);
+            		return R.error(RCode.START_CMD_ERROR);
+            	}
             	log.info("start loki:"+startCmd+"  end");
             }
         }else {
diff --git a/src/main/java/net/geedge/confagent/util/RCode.java b/src/main/java/net/geedge/confagent/util/RCode.java
index 2a9fd1f..8e09edd 100644
--- a/src/main/java/net/geedge/confagent/util/RCode.java
+++ b/src/main/java/net/geedge/confagent/util/RCode.java
@@ -19,6 +19,9 @@ public enum RCode {
 
 	CORTEX_CONFIG_ISNULL(10110,"The cortex config is required"),
 	
+	START_CMD_ERROR(10111,"The start command is error"),
+	STOP_CMD_ERROR(10112,"The stop command is error"),
+	
     ERROR(999, "error"); //通用错误/未知错误
 	private RCode(Integer code, String msg) {
 		this.code = code;