Zond: несколько фиксов
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
group = 'asys'
|
group = 'asys'
|
||||||
version = '0.6.11-SNAPSHOT'
|
version = '0.6.12-SNAPSHOT'
|
||||||
|
|
||||||
apply plugin: 'application'
|
apply plugin: 'application'
|
||||||
|
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ public class Main {
|
|||||||
Shell.getInstance().start(System.in, commandLine -> {
|
Shell.getInstance().start(System.in, commandLine -> {
|
||||||
if (commandLine.equalsIgnoreCase(":exit")) {
|
if (commandLine.equalsIgnoreCase(":exit")) {
|
||||||
Shell.getInstance().getOutput().println("force exit");
|
Shell.getInstance().getOutput().println("force exit");
|
||||||
// watchdog.destroyProcess();
|
watchdog.destroyProcess();
|
||||||
Shell.getInstance().shutdown();
|
Shell.getInstance().shutdown();
|
||||||
Main.shutdown();
|
Main.shutdown();
|
||||||
return;
|
return;
|
||||||
@@ -65,18 +65,13 @@ public class Main {
|
|||||||
pipeInputStream.write(commandLine+"\r\n");
|
pipeInputStream.write(commandLine+"\r\n");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
Connector.getInstance().startReconnect();
|
Connector.getInstance().startReconnect();
|
||||||
|
|
||||||
// int resultCode = executeProcess(args, Shell.getInstance().getOutput(), pipeInputStream);
|
int resultCode = executeProcess(args, Shell.getInstance().getOutput(), pipeInputStream);
|
||||||
|
|
||||||
// Shell.getInstance().shutdown();
|
System.out.println(Ansi.ansi().reset().newline()
|
||||||
//
|
.fg(Color.GREEN).a("Process Finished. Code: ")
|
||||||
//
|
.bold().fg(Color.WHITE).a(resultCode).reset());
|
||||||
// int resultCode = -2;
|
|
||||||
// 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 {
|
private static int executeProcess(String[] args, PrintStream printStream, InputStream stdin) throws IOException {
|
||||||
|
|||||||
Reference in New Issue
Block a user