IGNITE-7121 Visor CMD: Fixed reading last command line in batch mode.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7b7fb8cb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7b7fb8cb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7b7fb8cb Branch: refs/heads/ignite-zk-ce Commit: 7b7fb8cb420ada5d9fe130e593e09a3adaeba6cd Parents: 27095c8 Author: vsisko <[email protected]> Authored: Tue Dec 12 10:58:52 2017 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Dec 12 10:58:52 2017 +0700 ---------------------------------------------------------------------- .../main/scala/org/apache/ignite/visor/commands/VisorConsole.scala | 2 +- .../src/main/scala/org/apache/ignite/visor/visor.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7b7fb8cb/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala index 0a7bcb0..a43f9ff 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala @@ -161,7 +161,7 @@ class VisorConsole { visor.batchMode = true visor.quiet = quiet - val script = if (noBatchQuit) cmd else cmd + "\nquit\n" + val script = cmd + (if (cmd.last == '\n') "" else "\n") + (if (noBatchQuit) "" else "quit\n") new ByteArrayInputStream(script.getBytes("UTF-8")) http://git-wip-us.apache.org/repos/asf/ignite/blob/7b7fb8cb/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala index 069e50f..41a14d0 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala @@ -240,7 +240,7 @@ object visor extends VisorTag { var batchMode: Boolean = false - /** Quiet mode to disable node log and information messages output. */ + /** Quiet mode to disable internal node log and information messages output. */ var quiet: Boolean = false def reader(reader: ConsoleReader) {
