Merge pull request #3 from kumuluz/feature/contextData

Added context data to Log4j logger
kumuluz · Jul 10, 2019 · 693d14a · 693d14a
2 parents 1e52e8c + b655b89
commit 693d14a
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/log4j2/src/main/java/com/kumuluz/ee/logs/Log4j2LogCommons.java b/log4j2/src/main/java/com/kumuluz/ee/logs/Log4j2LogCommons.java
@@ -35,6 +35,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.MarkerManager;
 
+import java.util.HashMap;
+import java.util.ServiceLoader;
+
 /**
  * Kumuluz-logs logger interface
  *
@@ -165,6 +168,10 @@ private void logEnd(LogResourceContext logResourceContext) {
      * @param logMessage   object defining LogMessage
      */
     private void log(LogLevel level, Marker marker, Marker parentMarker, LogMessage logMessage) {
+        HashMap<String, String> context = new HashMap<>();
+
+        context = addContextData(context);
+
 
         String message;
         if (logMessage == null || logMessage.getMessage() == null) {
@@ -174,13 +181,31 @@ private void log(LogLevel level, Marker marker, Marker parentMarker, LogMessage
         }
 
         if (logMessage != null && logMessage.getFields() != null) {
+            CloseableThreadContext.putAll(context);
             try (final CloseableThreadContext.Instance ctc = CloseableThreadContext.putAll(logMessage.getFields())) {
                 logger.log(Log4j2LogUtil.convertToLog4j2Level(level), MarkerManager.getMarker(marker.toString())
                         .setParents(MarkerManager.getMarker(parentMarker.toString())), message);
             }
         } else {
             logger.log(Log4j2LogUtil.convertToLog4j2Level(level), MarkerManager.getMarker(marker.toString())
                     .setParents(MarkerManager.getMarker(parentMarker.toString())), message);
+
         }
     }
+
+    /**
+     * @param data defines input data
+     * @return data with appended context data
+     */
+    private HashMap<String, String> addContextData(HashMap<String, String> data) {
+
+        ServiceLoader.load(RequestContext.class).forEach(provider -> {
+            HashMap<String, String> context = provider.getContext();
+            if (context != null) {
+                data.putAll(context);
+            }
+        });
+
+        return data;
+    }
 }