From 4ba1654d93c18c0c953e407000bb838a08d9d356 Mon Sep 17 00:00:00 2001 From: tparker Date: Thu, 25 Jul 2019 07:32:40 -0800 Subject: [PATCH 1/4] exit ImportEW quickly --- .../usgs/volcanoes/winston/in/ew/ImportEW.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/gov/usgs/volcanoes/winston/in/ew/ImportEW.java b/src/main/java/gov/usgs/volcanoes/winston/in/ew/ImportEW.java index cea24ce..9ea7831 100644 --- a/src/main/java/gov/usgs/volcanoes/winston/in/ew/ImportEW.java +++ b/src/main/java/gov/usgs/volcanoes/winston/in/ew/ImportEW.java @@ -936,14 +936,16 @@ public static void consoleInputManager(final ImportEW im) { if (s != null) { s = s.toLowerCase().trim(); if (s.equals("q")) { + acceptCommands = false; im.quit(); - try { - im.join(); - } catch (final Throwable e) { - LOGGER.error("Failed to quit cleanly. {}"); - } finally { - im.printStatus(); - } + // exit Importer quickly, don't wait to flush any pending writes +// try { +// im.join(); +// } catch (final Throwable e) { +// LOGGER.error("Failed to quit cleanly. {}"); +// } finally { +// im.printStatus(); +// } System.exit(0); } else if (s.equals("s")) { im.printStatus(); From 8203851d30c6af51fdc2dd2a4b3df0fbb9fac190 Mon Sep 17 00:00:00 2001 From: tparker Date: Thu, 25 Jul 2019 07:36:09 -0800 Subject: [PATCH 2/4] fix perms --- bin/WWS.sh | 0 bin/WinstonTools.sh | 0 bin/WinstonVersion.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/WWS.sh mode change 100644 => 100755 bin/WinstonTools.sh mode change 100644 => 100755 bin/WinstonVersion.sh diff --git a/bin/WWS.sh b/bin/WWS.sh old mode 100644 new mode 100755 diff --git a/bin/WinstonTools.sh b/bin/WinstonTools.sh old mode 100644 new mode 100755 diff --git a/bin/WinstonVersion.sh b/bin/WinstonVersion.sh old mode 100644 new mode 100755 From 8965309ff91b3f7feca4a4a4e930ac627ac5cd75 Mon Sep 17 00:00:00 2001 From: tparker Date: Thu, 25 Jul 2019 07:42:59 -0800 Subject: [PATCH 3/4] exit wws quickly --- src/main/java/gov/usgs/volcanoes/winston/server/WWS.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/gov/usgs/volcanoes/winston/server/WWS.java b/src/main/java/gov/usgs/volcanoes/winston/server/WWS.java index d9b197a..38273cc 100644 --- a/src/main/java/gov/usgs/volcanoes/winston/server/WWS.java +++ b/src/main/java/gov/usgs/volcanoes/winston/server/WWS.java @@ -116,6 +116,7 @@ private static void attendConsole(WWS wws) { WWS.printKeys(); } } + System.exit(0); } private static void printKeys() { From 0ed958133dde5654938e132db69f74204f31998f Mon Sep 17 00:00:00 2001 From: tparker Date: Thu, 25 Jul 2019 10:47:21 -0800 Subject: [PATCH 4/4] version bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 03c2db9..7e19286 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ gov.usgs.volcanoes winston - 1.3.5-SNAPSHOT + 1.3.5 jar Winston