From 4300556432cb492d1ef2fc8d44ab8b963381fed0 Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Wed, 6 Apr 2022 17:50:54 +0200
Subject: [PATCH] #2371 Improve logging

---
 ScalliGraph      | 2 +-
 conf/logback.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ScalliGraph b/ScalliGraph
index 561c5c1f27..6a590119ff 160000
--- a/ScalliGraph
+++ b/ScalliGraph
@@ -1 +1 @@
-Subproject commit 561c5c1f2755b3df94ece18ec951869b1ee0a660
+Subproject commit 6a590119ff69a3684e5f9dcc49a3f6e6e848c37f
diff --git a/conf/logback.xml b/conf/logback.xml
index 81ebc5d266..be6f11e3e2 100644
--- a/conf/logback.xml
+++ b/conf/logback.xml
@@ -15,13 +15,13 @@
             <maxFileSize>10MB</maxFileSize>
         </triggeringPolicy>
         <encoder>
-            <pattern>%date [%level] from %logger in %thread [%X{request}|%X{tx}] %message%n%xException</pattern>
+            <pattern>%date [%level] from %logger in %thread %replace(\(%X{userId}@%X{organisation}\) ){'\(@\) ',''}[%X{request}|%X{tx}] %message%n%xException</pattern>
         </encoder>
     </appender>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%coloredLevel %logger{15} [%X{request}|%X{tx}] %message%n%xException{10}
+            <pattern>%coloredLevel %logger{15} %replace(\(%X{userId}@%X{organisation}\) ){'\(@\) ',''}[%X{request}|%X{tx}] %message%n%xException{10}
             </pattern>
         </encoder>
     </appender>