Merge pull request #216 from rabbitmq/rabbitmq-perf-test-215-always-call-system-exit

Make sure to always call System#exit

Author: michaelklishin

src/main/java/com/rabbitmq/perf/PerfTest.java

@@ -56,6 +56,7 @@ public static void main(String [] args, PerfTestOptions perfTestOptions) {
         shutdownService.wrap(() -> metrics.close());
         Options metricsOptions = metrics.options();
         forEach(metricsOptions, option -> options.addOption(option));
+        int exitStatus = 0;
         try {
             CommandLine rawCmd = parser.parse(options, args);
             CommandLineProxy cmd = new CommandLineProxy(options, rawCmd, perfTestOptions.argumentLookup);
@@ -325,17 +326,18 @@ public static void main(String [] args, PerfTestOptions perfTestOptions) {
             set.run(true);
 
             stats.printFinal();
-        }
-        catch (ParseException exp) {
+        } catch (ParseException exp) {
             System.err.println("Parsing failed. Reason: " + exp.getMessage());
             usage(options);
         } catch (Exception e) {
             System.err.println("Main thread caught exception: " + e);
             LOGGER.error("Main thread caught exception", e);
-            systemExiter.exit(1);
+            exitStatus = 1;
         } finally {
             shutdownService.close();
         }
+        // we need to exit explicitly, without waiting alive threads (e.g. when using --shutdown-timeout 0)
+        systemExiter.exit(exitStatus);
     }
 
     private static PrintWriter openCsvFileForWriting(String outputFile, ShutdownService shutdownService) throws IOException {