LDEV-4752 - add support for json message in jsonLayout

lucee · Nov 16, 2023 · 84a7830 · 84a7830
1 parent 8f1fec6
commit 84a7830
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/core/src/main/java/lucee/commons/io/log/log4j2/layout/JsonLayout.java b/core/src/main/java/lucee/commons/io/log/log4j2/layout/JsonLayout.java
@@ -241,15 +241,6 @@ public String toSerializable(final LogEvent event) {
 				root.setEL("thread", th);
 			}
 
-			// page context
-			PageContext pc = ThreadLocalPageContext.get();
-			if (pc != null) {
-				root.setEL("pageContextId", pc.getId());
-				if (pc instanceof PageContextImpl) {
-					root.setEL("requestId", ((PageContextImpl) pc).getRequestId());
-				}
-			}
-
 			if (this.locationInfo) {
 				StackTraceElement data = null;
 				for (StackTraceElement ste: Thread.currentThread().getStackTrace()) {
@@ -286,6 +277,11 @@ public String toSerializable(final LogEvent event) {
 				}
 				else user = remoteUser.getUsername();
 				if (!Util.isEmpty(user, true)) root.setEL("authUser", user);
+
+				root.setEL("pageContextId", pc.getId());
+				if (pc instanceof PageContextImpl) {
+					root.setEL("requestId", ((PageContextImpl) pc).getRequestId());
+				}
 			}
 
 			// env var