Merge pull request #87 from tparker-usgs/master

finish 1.3.5 release
usgs · Jul 25, 2019 · 0809a56 · 0809a56
2 parents e6ae12a + fb76cb3
commit 0809a56
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/bin/WWS.sh b/bin/WWS.sh
diff --git a/bin/WinstonTools.sh b/bin/WinstonTools.sh
diff --git a/bin/WinstonVersion.sh b/bin/WinstonVersion.sh
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>gov.usgs.volcanoes</groupId>
 	<artifactId>winston</artifactId>
-	<version>1.3.5-SNAPSHOT</version>
+	<version>1.3.5</version>
 	<packaging>jar</packaging>
 
 	<name>Winston</name>

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
@@ -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();

diff --git 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() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,6 +116,7 @@ private static void attendConsole(WWS wws) { @@
             WWS.printKeys();
           }
         }
+        System.exit(0);
       }
       private static void printKeys() {
@@ Expand Down @@