Merge branch 'roman-yepishev-enoc-monitor-socket'

DeemOpen · Jul 2, 2015 · 7c16b0f · 7c16b0f
2 parents 63a904c + 60ac239
commit 7c16b0f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/com/deem/zkui/controller/Monitor.java b/src/main/java/com/deem/zkui/controller/Monitor.java
@@ -58,7 +58,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
             templateParam.put("stats", stats);
             ServletUtil.INSTANCE.renderHtml(request, response, templateParam, "monitor.ftl.html");
 
-        } catch (IOException | InterruptedException | TemplateException ex) {
+        } catch (IOException | TemplateException ex) {
             logger.error(Arrays.toString(ex.getStackTrace()));
             ServletUtil.INSTANCE.renderError(request, response, ex.getMessage());
         }

diff --git a/src/main/java/com/deem/zkui/utils/CmdUtil.java b/src/main/java/com/deem/zkui/utils/CmdUtil.java
@@ -17,9 +17,11 @@
  */
 package com.deem.zkui.utils;
 
+import java.net.Socket;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.PrintWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,18 +30,21 @@ public enum CmdUtil {
     INSTANCE;
     private final static Logger logger = LoggerFactory.getLogger(CmdUtil.class);
 
-    public String executeCmd(String cmd, String zkServer, String zkPort) throws IOException, InterruptedException {
-        String[] cmdArr = {"/bin/sh", "-c", "echo " + cmd + " | nc -q5 " + zkServer + " " + zkPort};
-        Process p = Runtime.getRuntime().exec(cmdArr);
-        p.waitFor();
-        BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+    public String executeCmd(String cmd, String zkServer, String zkPort) throws IOException {
+        Socket s = new Socket(zkServer, Integer.parseInt(zkPort));
+        PrintWriter out = new PrintWriter(s.getOutputStream(), true);
+        BufferedReader reader = new BufferedReader(new InputStreamReader(s.getInputStream()));
+        out.println(cmd);
         String line = reader.readLine();
         StringBuilder sb = new StringBuilder();
         while (line != null) {
             sb.append(line);
             sb.append("<br/>");
             line = reader.readLine();
         }
+        reader.close();
+        out.close();
+        s.close();
         return sb.toString();
     }
 }