From df454679c261d62047a64cafe08a0bcf4aa1bb76 Mon Sep 17 00:00:00 2001 From: michaeloffner Date: Thu, 23 May 2024 23:13:14 +0200 Subject: [PATCH] change name for debugging env var --- .../cfml/context/admin/debugging.settings.cfm | 2 +- .../main/cfml/context/admin/debugging.show.cfm | 2 +- .../lucee/runtime/config/ConfigWebFactory.java | 17 +++++++++++++---- loader/build.xml | 2 +- loader/pom.xml | 2 +- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/core/src/main/cfml/context/admin/debugging.settings.cfm b/core/src/main/cfml/context/admin/debugging.settings.cfm index 2102e14063..304c194004 100755 --- a/core/src/main/cfml/context/admin/debugging.settings.cfm +++ b/core/src/main/cfml/context/admin/debugging.settings.cfm @@ -167,7 +167,7 @@ Redirtect to entry ---> this.monitoring.debugging#ucFirst(item)#=#_debug[item]#; - + diff --git a/core/src/main/cfml/context/admin/debugging.show.cfm b/core/src/main/cfml/context/admin/debugging.show.cfm index e6152014ff..e30b80537f 100755 --- a/core/src/main/cfml/context/admin/debugging.show.cfm +++ b/core/src/main/cfml/context/admin/debugging.show.cfm @@ -99,7 +99,7 @@ Redirtect to entry ---> this.monitoring.show#UCFirst(item)# = #_mon[item]#; - + diff --git a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java index f8fce3ace0..8f8a7f0792 100644 --- a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java +++ b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java @@ -4616,7 +4616,7 @@ private static void _loadDebug(ConfigServerImpl configServer, ConfigImpl config, if (StringUtil.isEmpty(str, true)) str = getAttr(root, "debuggingEnabled"); if (StringUtil.isEmpty(str, true)) str = getAttr(root, "debugging"); if (StringUtil.isEmpty(str, true)) str = getAttr(root, "debug"); - if (!hasCS && StringUtil.isEmpty(str, true)) str = SystemUtil.getSystemPropOrEnvVar("lucee.show.debug", null); + if (!hasCS && StringUtil.isEmpty(str, true)) str = SystemUtil.getSystemPropOrEnvVar("lucee.monitoring.showDebug", null); ; if (hasAccess && !StringUtil.isEmpty(str)) { @@ -4630,7 +4630,7 @@ private static void _loadDebug(ConfigServerImpl configServer, ConfigImpl config, if (StringUtil.isEmpty(str, true)) str = getAttr(root, "doc"); if (StringUtil.isEmpty(str, true)) str = getAttr(root, "documentation"); if (StringUtil.isEmpty(str, true)) str = getAttr(root, "reference"); - if (!hasCS && StringUtil.isEmpty(str, true)) str = SystemUtil.getSystemPropOrEnvVar("lucee.show.doc", null); + if (!hasCS && StringUtil.isEmpty(str, true)) str = SystemUtil.getSystemPropOrEnvVar("lucee.monitoring.showDoc", null); if (hasAccess && !StringUtil.isEmpty(str)) { config.setShowDoc(toBoolean(str, false)); } @@ -4641,7 +4641,7 @@ private static void _loadDebug(ConfigServerImpl configServer, ConfigImpl config, if (StringUtil.isEmpty(str, true)) str = getAttr(root, "showMetrics"); if (StringUtil.isEmpty(str, true)) str = getAttr(root, "metric"); if (StringUtil.isEmpty(str, true)) str = getAttr(root, "metrics"); - if (!hasCS && StringUtil.isEmpty(str, true)) str = SystemUtil.getSystemPropOrEnvVar("lucee.show.metric", null); + if (!hasCS && StringUtil.isEmpty(str, true)) str = SystemUtil.getSystemPropOrEnvVar("lucee.monitoring.showMetric", null); if (hasAccess && !StringUtil.isEmpty(str)) { config.setShowMetric(toBoolean(str, false)); } @@ -4651,7 +4651,7 @@ private static void _loadDebug(ConfigServerImpl configServer, ConfigImpl config, str = getAttr(root, "showTest"); if (StringUtil.isEmpty(str, true)) str = getAttr(root, "showTests"); if (StringUtil.isEmpty(str, true)) str = getAttr(root, "test"); - if (!hasCS && StringUtil.isEmpty(str, true)) str = SystemUtil.getSystemPropOrEnvVar("lucee.show.test", null); + if (!hasCS && StringUtil.isEmpty(str, true)) str = SystemUtil.getSystemPropOrEnvVar("lucee.monitoring.showTest", null); if (hasAccess && !StringUtil.isEmpty(str)) { config.setShowTest(toBoolean(str, false)); } @@ -4671,6 +4671,7 @@ private static void _loadDebug(ConfigServerImpl configServer, ConfigImpl config, int options = 0; String str = getAttr(root, "debuggingDatabase"); if (StringUtil.isEmpty(str)) str = getAttr(root, "debuggingShowDatabase"); + if (StringUtil.isEmpty(str) && !hasCS) str = SystemUtil.getSystemPropOrEnvVar("lucee.monitoring.debuggingDatabase", null); if (hasAccess && !StringUtil.isEmpty(str)) { if (toBoolean(str, false)) options += ConfigPro.DEBUG_DATABASE; } @@ -4679,6 +4680,7 @@ private static void _loadDebug(ConfigServerImpl configServer, ConfigImpl config, str = getAttr(root, "debuggingException"); if (StringUtil.isEmpty(str)) str = getAttr(root, "debuggingShowException"); + if (StringUtil.isEmpty(str) && !hasCS) str = SystemUtil.getSystemPropOrEnvVar("lucee.monitoring.debuggingException", null); if (hasAccess && !StringUtil.isEmpty(str)) { if (toBoolean(str, false)) options += ConfigPro.DEBUG_EXCEPTION; } @@ -4687,6 +4689,7 @@ private static void _loadDebug(ConfigServerImpl configServer, ConfigImpl config, str = getAttr(root, "debuggingTemplate"); if (StringUtil.isEmpty(str)) str = getAttr(root, "debuggingShowTemplate"); + if (StringUtil.isEmpty(str) && !hasCS) str = SystemUtil.getSystemPropOrEnvVar("lucee.monitoring.debuggingTemplate", null); if (hasAccess && !StringUtil.isEmpty(str)) { if (toBoolean(str, false)) options += ConfigPro.DEBUG_TEMPLATE; } @@ -4697,6 +4700,7 @@ private static void _loadDebug(ConfigServerImpl configServer, ConfigImpl config, str = getAttr(root, "debuggingDump"); if (StringUtil.isEmpty(str)) str = getAttr(root, "debuggingShowDump"); + if (StringUtil.isEmpty(str) && !hasCS) str = SystemUtil.getSystemPropOrEnvVar("lucee.monitoring.debuggingDump", null); if (hasAccess && !StringUtil.isEmpty(str)) { if (toBoolean(str, false)) options += ConfigPro.DEBUG_DUMP; } @@ -4706,6 +4710,7 @@ private static void _loadDebug(ConfigServerImpl configServer, ConfigImpl config, str = getAttr(root, "debuggingTracing"); if (StringUtil.isEmpty(str)) str = getAttr(root, "debuggingShowTracing"); if (StringUtil.isEmpty(str)) str = getAttr(root, "debuggingShowTrace"); + if (StringUtil.isEmpty(str) && !hasCS) str = SystemUtil.getSystemPropOrEnvVar("lucee.monitoring.debuggingTracing", null); if (hasAccess && !StringUtil.isEmpty(str)) { if (toBoolean(str, false)) options += ConfigPro.DEBUG_TRACING; } @@ -4714,6 +4719,7 @@ private static void _loadDebug(ConfigServerImpl configServer, ConfigImpl config, str = getAttr(root, "debuggingTimer"); if (StringUtil.isEmpty(str)) str = getAttr(root, "debuggingShowTimer"); + if (StringUtil.isEmpty(str) && !hasCS) str = SystemUtil.getSystemPropOrEnvVar("lucee.monitoring.debuggingTimer", null); if (hasAccess && !StringUtil.isEmpty(str)) { if (toBoolean(str, false)) options += ConfigPro.DEBUG_TIMER; } @@ -4722,6 +4728,7 @@ private static void _loadDebug(ConfigServerImpl configServer, ConfigImpl config, str = getAttr(root, "debuggingImplicitAccess"); if (StringUtil.isEmpty(str)) str = getAttr(root, "debuggingShowImplicitAccess"); + if (StringUtil.isEmpty(str) && !hasCS) str = SystemUtil.getSystemPropOrEnvVar("lucee.monitoring.debuggingImplicitAccess", null); if (hasAccess && !StringUtil.isEmpty(str)) { if (toBoolean(str, false)) options += ConfigPro.DEBUG_IMPLICIT_ACCESS; } @@ -4730,6 +4737,7 @@ private static void _loadDebug(ConfigServerImpl configServer, ConfigImpl config, str = getAttr(root, "debuggingQueryUsage"); if (StringUtil.isEmpty(str)) str = getAttr(root, "debuggingShowQueryUsage"); + if (StringUtil.isEmpty(str) && !hasCS) str = SystemUtil.getSystemPropOrEnvVar("lucee.monitoring.debuggingQueryUsage", null); if (hasAccess && !StringUtil.isEmpty(str)) { if (toBoolean(str, false)) options += ConfigPro.DEBUG_QUERY_USAGE; } @@ -4737,6 +4745,7 @@ private static void _loadDebug(ConfigServerImpl configServer, ConfigImpl config, else if (hasCS && configServer.hasDebugOptions(ConfigPro.DEBUG_QUERY_USAGE)) options += ConfigPro.DEBUG_QUERY_USAGE; str = getAttr(root, "debuggingThread"); + if (StringUtil.isEmpty(str) && !hasCS) str = SystemUtil.getSystemPropOrEnvVar("lucee.monitoring.debuggingThread", null); if (hasAccess && !StringUtil.isEmpty(str)) { if (toBoolean(str, false)) options += ConfigPro.DEBUG_THREAD; } diff --git a/loader/build.xml b/loader/build.xml index eb82b32211..4852d5ba69 100644 --- a/loader/build.xml +++ b/loader/build.xml @@ -2,7 +2,7 @@ - + diff --git a/loader/pom.xml b/loader/pom.xml index 7db97345e5..6477f643fc 100644 --- a/loader/pom.xml +++ b/loader/pom.xml @@ -3,7 +3,7 @@ org.lucee lucee - 6.1.0.156-SNAPSHOT + 6.1.0.157-SNAPSHOT jar Lucee Loader Build