From 4e1156d4bc163b2486b16fefee921e37a3fd21e4 Mon Sep 17 00:00:00 2001
From: Adrian Malacoda <malacoda@monarch-pass.net>
Date: Thu, 17 Dec 2020 02:50:28 -0600
Subject: [PATCH] when testing servers, don't propagate exceptions but do note
 them

---
 desktop/.factorypath                                   |  4 +++-
 .../src/main/java/net/monarchpass/piecannon/App.java   | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/desktop/.factorypath b/desktop/.factorypath
index dd89b2b..f9aec58 100644
--- a/desktop/.factorypath
+++ b/desktop/.factorypath
@@ -1,6 +1,9 @@
 <factorypath>
     <factorypathentry kind="VARJAR" id="M2_REPO/net/monarchpass/libpiecannon/0.0.1-SNAPSHOT/libpiecannon-0.0.1-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/github/mwiede/jsch/0.1.60/jsch-0.1.60.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/jodd/jodd-http/6.0.3/jodd-http-6.0.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/jodd/jodd-util/6.0.0/jodd-util-6.0.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/guava/30.0-jre/guava-30.0-jre.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" enabled="true" runInBatchMode="false"/>
@@ -9,6 +12,5 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/net/kothar/xdg-java/0.1.1/xdg-java-0.1.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/projectlombok/lombok/1.18.16/lombok-1.18.16.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>
diff --git a/desktop/src/main/java/net/monarchpass/piecannon/App.java b/desktop/src/main/java/net/monarchpass/piecannon/App.java
index 42743ed..ef66131 100644
--- a/desktop/src/main/java/net/monarchpass/piecannon/App.java
+++ b/desktop/src/main/java/net/monarchpass/piecannon/App.java
@@ -51,8 +51,16 @@ public class App {
     public static void testServers (final List<Server> servers) {
         log.log(Level.INFO, "Testing all defined servers");
         for (final Server server : servers) {
+            Object result;
+            try {
+                result = PieCannon.testServer(server);
+            }
+            catch (final Exception exception) {
+                result = exception;
+            }
+            
             log.log(Level.INFO, "{0} {1}: {2}", new Object[] {
-                server.getClass().getSimpleName(), server.getLabel(), PieCannon.testServer(server)
+                server.getClass().getSimpleName(), server.getLabel(), result
             });
         }
     }