Merge pull request #1453 from dimagi/reportNonFatals

Route exception logs to logException
dimagi · Dec 12, 2024 · 7d747e3 · 7d747e3
2 parents 25a9317 + dfa1f68
commit 7d747e3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/org/commcare/util/LogTypes.java b/src/main/java/org/commcare/util/LogTypes.java
@@ -116,4 +116,8 @@ public class LogTypes {
 
     public static final String TYPE_MEDIA_EVENT = "media-event";
 
+    /**
+     * A Java Exception log
+     */
+    public static final String TYPE_EXCEPTION = "exception";
 }
diff --git a/src/main/java/org/javarosa/core/api/ILogger.java b/src/main/java/org/javarosa/core/api/ILogger.java
@@ -30,4 +30,6 @@ public interface ILogger {
     int logSize();
 
     void halt();
+
+    void logException(Throwable e);
 }
diff --git a/src/main/java/org/javarosa/core/services/Logger.java b/src/main/java/org/javarosa/core/services/Logger.java
@@ -1,5 +1,6 @@
 package org.javarosa.core.services;
 
+import org.commcare.util.LogTypes;
 import org.javarosa.core.api.ILogger;
 import org.javarosa.core.log.FatalException;
 import org.javarosa.core.log.WrappedException;
@@ -52,7 +53,14 @@ public static void log(String type, String message) {
 
     public static void exception(String info, Throwable e) {
         e.printStackTrace();
-        log("exception", (info != null ? info + ": " : "") + WrappedException.printException(e));
+        log(LogTypes.TYPE_EXCEPTION, (info != null ? info + ": " : "") + WrappedException.printException(e));
+        if (logger != null) {
+            try {
+                logger.logException(e);
+            } catch (RuntimeException ex) {
+                logger.panic();
+            }
+        }
     }
 
     public static void die(String thread, Exception e) {