From ce4e8871aad7c64960a689106fe1e3147858848d Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sun, 13 Aug 2017 16:48:26 +0300
Subject: [PATCH] =?UTF-8?q?Zond:=20=D1=86=D0=B2=D0=B5=D1=82=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D1=82=D0=B5=D0=BA=D1=81=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/asys/zond/ZondCommandHandler.java    | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/zond/src/main/java/asys/zond/ZondCommandHandler.java b/zond/src/main/java/asys/zond/ZondCommandHandler.java
index e358633..4d9e736 100644
--- a/zond/src/main/java/asys/zond/ZondCommandHandler.java
+++ b/zond/src/main/java/asys/zond/ZondCommandHandler.java
@@ -12,6 +12,7 @@ import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.ExecuteException;
 import org.apache.commons.exec.ExecuteWatchdog;
 import org.apache.commons.exec.Executor;
+import org.fusesource.jansi.Ansi;
 
 import java.io.IOException;
 
@@ -30,6 +31,12 @@ public class ZondCommandHandler implements CommandHandler {
         this.proxyStdIn = proxyStdIn;
     }
 
+    private static String zondColored(String string) {
+        return Ansi.ansi().bg(Ansi.Color.WHITE).fg(Ansi.Color.RED).a("[Zond]")
+                .reset().fg(Ansi.Color.RED).a(' ').a(string)
+                .reset().toString();
+    }
+
     @Override
     public void handle(String commandLine) {
         if (commandLine.startsWith(":")) {
@@ -54,10 +61,10 @@ public class ZondCommandHandler implements CommandHandler {
         } else if (line.equalsIgnoreCase("connect")) {
             Connector.getInstance().startReconnect();
         } else if (line.equalsIgnoreCase("disconnect")) {
-            Shell.getInstance().getOutput().println("Disconnect");
+            Shell.getInstance().getOutput().println(zondColored("Disconnect"));
             Connector.getInstance().shutdown();
         } else if (line.equalsIgnoreCase("reload")) {
-            Shell.getInstance().getOutput().println("Reload config");
+            Shell.getInstance().getOutput().println(zondColored("Reload config"));
             try {
                 Config.getInstance().load();
             } catch (IOException e) {
@@ -104,8 +111,8 @@ public class ZondCommandHandler implements CommandHandler {
 
                         deadTime = (System.currentTimeMillis()/1000) + (delay*1000);
                         pingMonitor.start(() -> {
-                            Shell.getInstance().getOutput().println("[!] Process - zobie?");
-                            Shell.getInstance().getOutput().println("[!] Force shutdown process.");
+                            Shell.getInstance().getOutput().println(zondColored("[!] Process - zobie?"));
+                            Shell.getInstance().getOutput().println(zondColored("[!] Force shutdown process."));
                             flagForceRestartProcess = true;
                             killProcess();
                         });
@@ -113,7 +120,7 @@ public class ZondCommandHandler implements CommandHandler {
                     } catch (ExecuteException e) {
                         code = e.getExitValue();
                     } catch (IOException e) {
-                        Shell.getInstance().getOutput().println("[!] Exception message: " + e.getMessage());
+                        Shell.getInstance().getOutput().println(zondColored("[!] Exception message: " + e.getMessage()));
                         code = -99;
                     }
                     long currTime = System.currentTimeMillis()/1000;
@@ -121,7 +128,7 @@ public class ZondCommandHandler implements CommandHandler {
                     server.shutdown();
                     pingMonitor.stop();
                     server = null;
-                    Shell.getInstance().getOutput().println("[i] Process finished. Code: " + code);
+                    Shell.getInstance().getOutput().println(zondColored("[i] Process finished. Code: " + code));
 
                     if (pingMonitor.isCorrectShutdown()) {
                         flagForceRestartProcess = false;
@@ -129,16 +136,16 @@ public class ZondCommandHandler implements CommandHandler {
                         break;
                     } else {
                         if (currTime <= deadTime && !flagManualKill) {
-                            Shell.getInstance().getOutput().println("[!] Premature end process.");
+                            Shell.getInstance().getOutput().println(zondColored("[!] Premature end process."));
                             _try++;
                             if (_try < 2) {
-                                Shell.getInstance().getOutput().println("[!] Try start process again...");
+                                Shell.getInstance().getOutput().println(zondColored("[!] Try start process again..."));
                             }
                         } else if (flagForceRestartProcess) {
                             _try = 0;
                             flagForceRestartProcess = false;
                         } else if (code != 0 && code != -99 && !flagManualKill) {
-                            Shell.getInstance().getOutput().println("[!] Try start process again...");
+                            Shell.getInstance().getOutput().println(zondColored("[!] Try start process again..."));
                             _try = 0;
                         } else {
                             break;
@@ -147,7 +154,7 @@ public class ZondCommandHandler implements CommandHandler {
                 } while (_try < 2);
 
                 if (_try == 2) {
-                    Shell.getInstance().getOutput().println("[!] Discovered the problem when starting the process");
+                    Shell.getInstance().getOutput().println(zondColored("[!] Discovered the problem when starting the process"));
                 }
             };
             threadExec = new Thread(task, "Zond Exec");