From dbf64b09875fc93fcb4f6aea51dfff5deea05e87 Mon Sep 17 00:00:00 2001
From: Viktor Lofgren <vlofgren@marginalia.nu>
Date: Tue, 27 Feb 2024 13:39:24 +0100
Subject: [PATCH] (logs)  Add the option for json logging

---
 .../nu/marginalia/service/server/Service.java |  5 ++++
 code/common/service/resources/log4j2-json.xml | 28 +++++++++++++++++++
 .../nu/marginalia/process/ProcessService.java |  6 ++++
 3 files changed, 39 insertions(+)
 create mode 100644 code/common/service/resources/log4j2-json.xml

diff --git a/code/common/service/java/nu/marginalia/service/server/Service.java b/code/common/service/java/nu/marginalia/service/server/Service.java
index ba076ae5..c959e269 100644
--- a/code/common/service/java/nu/marginalia/service/server/Service.java
+++ b/code/common/service/java/nu/marginalia/service/server/Service.java
@@ -90,6 +90,11 @@ public class Service {
         initialization.addCallback(() -> params.eventLog.logEvent("SVC-INIT", serviceName + ":" + config.node()));
         initialization.addCallback(() -> serviceRegistry.announceInstance(config.instanceUuid()));
 
+        Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
+            logger.error("Uncaught exception", e);
+            request_counter_err.labels(serviceName, Integer.toString(node)).inc();
+        });
+
         if (!initialization.isReady() && ! initialized ) {
             initialized = true;
 
diff --git a/code/common/service/resources/log4j2-json.xml b/code/common/service/resources/log4j2-json.xml
new file mode 100644
index 00000000..dd2fc6d2
--- /dev/null
+++ b/code/common/service/resources/log4j2-json.xml
@@ -0,0 +1,28 @@
+<Configuration xmlns="http://logging.apache.org/log4j/2.0/config" >
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss,SSS} %style{%-8markerSimpleName}{FG_Cyan} %highlight{%-5level}{FATAL=red, ERROR=red, WARN=yellow} %-24t %-20c{1}  --  %msg%n"/>
+            <Filters>
+                <MarkerFilter marker="QUERY" onMatch="DENY" onMismatch="NEUTRAL" />
+                <MarkerFilter marker="HTTP" onMatch="DENY" onMismatch="NEUTRAL" />
+            </Filters>
+        </Console>
+        <RollingFile name="LogToFile" fileName="/var/log/wmsa/wmsa-${sys:service-name}-${env:WMSA_SERVICE_NODE:-0}.log" filePattern="/var/log/wmsa/wmsa-${sys:service-name}-${env:WMSA_SERVICE_NODE:-0}-log-%d{MM-dd-yy-HH-mm-ss}-%i.log.gz"
+                     ignoreExceptions="false">
+            <JSONLayout compact="true" eventEol="true" properties="true" stacktraceAsString="true" includeTimeMillis="true"/>
+            <Filters>
+                <MarkerFilter marker="QUERY" onMatch="DENY" onMismatch="NEUTRAL" />
+                <MarkerFilter marker="HTTP" onMatch="DENY" onMismatch="NEUTRAL" />
+            </Filters>
+            <SizeBasedTriggeringPolicy size="10MB" />
+        </RollingFile>
+    </Appenders>
+    <Loggers>
+        <Logger name="org.apache.zookeeper" level="WARN" />
+
+        <Root level="info">
+            <AppenderRef ref="Console"/>
+            <AppenderRef ref="LogToFile"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/code/execution/java/nu/marginalia/process/ProcessService.java b/code/execution/java/nu/marginalia/process/ProcessService.java
index 848f0233..0d153c8f 100644
--- a/code/execution/java/nu/marginalia/process/ProcessService.java
+++ b/code/execution/java/nu/marginalia/process/ProcessService.java
@@ -94,6 +94,12 @@ public class ProcessService {
         else args.add("-da");
 
         args.add("--enable-preview");
+
+        String loggingOpts = System.getProperty("log4j2.configurationFile");
+        if (loggingOpts != null) {
+            args.add("-Dlog4j.configurationFile=" + loggingOpts);
+        }
+
         args.addAll(processId.envOpts());
         args.add(processId.mainClass);
         args.addAll(Arrays.asList(extraArgs));