X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/2044a7d7a58ada7ca1e67a80012e3ffdaf86c88c..2ab42ca5471e8fc1e1a31cde954e19564178f114:/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 fc63b89e..863f8388 100644
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -26,7 +26,7 @@ import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
-import org.asamk.signal.manager.LibSignalLogger;
+import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.SecurityProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
@@ -56,6 +56,9 @@ public class Main {
                 e.getCause().printStackTrace();
             }
             status = getStatusForError(e);
+        } catch (Throwable e) {
+            e.printStackTrace();
+            status = 2;
         }
         System.exit(status);
     }
@@ -77,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) {
@@ -87,7 +90,7 @@ public class Main {
             System.setProperty("org.slf4j.simpleLogger.showShortLogName", "false");
             System.setProperty("org.slf4j.simpleLogger.showDateTime", "true");
             System.setProperty("org.slf4j.simpleLogger.dateTimeFormat", "yyyy-MM-dd'T'HH:mm:ss.SSSXX");
-            LibSignalLogger.initLogger();
+            Manager.initLogger();
         } else {
             System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
             System.setProperty("org.slf4j.simpleLogger.showThreadName", "false");