Split receiveMessages method

[signal-cli] / src / main / java / org / asamk / signal / Main.java

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index e07475003146f5af717598d89b01b92314ee41d2..2a95e6de1b4bc287e574a6fc94f794dafa279cf3 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -40,7 +40,8 @@ public class Main {
         installSecurityProviderWorkaround();
 
         // Configuring the logger needs to happen before any logger is initialized
-        configureLogging(isVerbose(args));
+        final var isVerbose = isVerbose(args);
+        configureLogging(isVerbose);
 
         var parser = App.buildArgumentParser();
 
@@ -51,7 +52,13 @@ public class Main {
             new App(ns).init();
         } catch (CommandException e) {
             System.err.println(e.getMessage());
+            if (isVerbose && e.getCause() != null) {
+                e.getCause().printStackTrace();
+            }
             status = getStatusForError(e);
+        } catch (Throwable e) {
+            e.printStackTrace();
+            status = 2;
         }
         System.exit(status);
     }
@@ -73,7 +80,7 @@ public class Main {
             return false;
         }
 
-        return ns.getBoolean("verbose");
+        return Boolean.TRUE.equals(ns.getBoolean("verbose"));
     }
 
     private static void configureLogging(final boolean verbose) {