From 85af1ed2a12354a9398086e964c31166427cb19b Mon Sep 17 00:00:00 2001 From: Nicolas Micoud <58596990+nmicoud@users.noreply.github.com> Date: Tue, 21 Mar 2023 05:08:44 +0100 Subject: [PATCH] IDEMPIERE-5608: Improve server logs by tenant and user data (#1715) * IDEMPIERE-5608: Improve server logs by tenant and user data * IDEMPIERE-5608: Improve server logs by tenant and user data - migration script * IDEMPIERE-5680: Improve server logs by tenant and user data - use VM argument Co-Authored-By: Carlos Ruiz * IDEMPIERE-5608: Improve server logs by tenant and user data: various fixes * IDEMPIERE-5608: Improve server logs by tenant and user data - revert changes on server.product.launch * IDEMPIERE-5608: Improve server logs by tenant and user data - Carlos's patch tested: ) Co-Authored-By: Carlos Ruiz --------- Co-authored-by: Carlos Ruiz --- .../src/org/compiere/util/CLogFormatter.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/util/CLogFormatter.java b/org.adempiere.base/src/org/compiere/util/CLogFormatter.java index dd9487326b..378e91ef45 100644 --- a/org.adempiere.base/src/org/compiere/util/CLogFormatter.java +++ b/org.adempiere.base/src/org/compiere/util/CLogFormatter.java @@ -119,6 +119,7 @@ public class CLogFormatter extends Formatter spaces = 9; sb.append(" ".substring(0, spaces)); } + sb.append(getPrefix()); /** Class.method **/ if (!m_shortFormat) @@ -318,5 +319,26 @@ public class CLogFormatter extends Formatter if (cause != null) fillExceptionTrace(sb, "caused by: ", cause); } // fillExceptionTrace - + + /** + * get the Prefix to write in file log from VM variable org.idempiere.FileLogPrefix + * @return + */ + private String getPrefix() + { + String prefix = null; + try + { + prefix = System.getProperty("org.idempiere.FileLogPrefix"); + if (!Util.isEmpty(prefix)) + return Env.parseContext(Env.getCtx(), 0, prefix, false); + } + catch (Exception ex) + { + System.out.println("Parsing error in org.idempiere.FileLogPrefix - setting back to empty from " + prefix); + System.setProperty("org.idempiere.FileLogPrefix", ""); + } + return ""; + } + } // CLogFormatter