From 915e612862995e4e3d2523d0e9d489fca6a19854 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Wed, 14 Jun 2017 17:43:00 +0300 Subject: [PATCH] =?UTF-8?q?Zond:=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20=D1=84=D0=B8=D0=BA=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zond/build.gradle | 2 +- zond/src/main/java/asys/zond/Main.java | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/zond/build.gradle b/zond/build.gradle index 030c805..6c3b453 100644 --- a/zond/build.gradle +++ b/zond/build.gradle @@ -1,5 +1,5 @@ group = 'asys' -version = '0.6.11-SNAPSHOT' +version = '0.6.12-SNAPSHOT' apply plugin: 'application' diff --git a/zond/src/main/java/asys/zond/Main.java b/zond/src/main/java/asys/zond/Main.java index af901fb..182632f 100644 --- a/zond/src/main/java/asys/zond/Main.java +++ b/zond/src/main/java/asys/zond/Main.java @@ -57,7 +57,7 @@ public class Main { Shell.getInstance().start(System.in, commandLine -> { if (commandLine.equalsIgnoreCase(":exit")) { Shell.getInstance().getOutput().println("force exit"); -// watchdog.destroyProcess(); + watchdog.destroyProcess(); Shell.getInstance().shutdown(); Main.shutdown(); return; @@ -65,18 +65,13 @@ public class Main { pipeInputStream.write(commandLine+"\r\n"); }); - Connector.getInstance().startReconnect(); -// int resultCode = executeProcess(args, Shell.getInstance().getOutput(), pipeInputStream); + int resultCode = executeProcess(args, Shell.getInstance().getOutput(), pipeInputStream); -// Shell.getInstance().shutdown(); -// -// -// int resultCode = -2; -// System.out.println(Ansi.ansi().reset().newline() -// .fg(Color.GREEN).a("Process Finished. Code: ") -// .bold().fg(Color.WHITE).a(resultCode).reset()); + System.out.println(Ansi.ansi().reset().newline() + .fg(Color.GREEN).a("Process Finished. Code: ") + .bold().fg(Color.WHITE).a(resultCode).reset()); } private static int executeProcess(String[] args, PrintStream printStream, InputStream stdin) throws IOException {