Skip to content

Commit

Permalink
change name for debugging env var
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaeloffner
michaeloffner committed May 23, 2024
1 parent d4226f6 commit df45467
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion core/src/main/cfml/context/admin/debugging.settings.cfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Redirtect to entry --->
this.monitoring.debugging#ucFirst(item)#=#_debug[item]#;
</cfsavecontent>
<cfset renderCodingTip( codeSample )>
<!--- <cfset renderSysPropEnvVar( name:"lucee.show.#item#",value:_mon[item])>--->
<cfset renderSysPropEnvVar( name:"lucee.monitoring.debugging#ucFirst(item)#",value:_debug[item])>



Expand Down
2 changes: 1 addition & 1 deletion core/src/main/cfml/context/admin/debugging.show.cfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Redirtect to entry --->
this.monitoring.show#UCFirst(item)# = #_mon[item]#;
</cfsavecontent>
<cfset renderCodingTip( codeSample )>
<cfset renderSysPropEnvVar( name:"lucee.show.#item#",value:_mon[item])>
<cfset renderSysPropEnvVar( name:"lucee.monitoring.show#ucFirst(item)#",value:_mon[item])>
</td>
</tr>
</cfloop>
Expand Down
17 changes: 13 additions & 4 deletions core/src/main/java/lucee/runtime/config/ConfigWebFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -4730,13 +4737,15 @@ 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;
}
else if (debugOptions != null && extractDebugOption("queryUsage", debugOptions)) options += ConfigPro.DEBUG_QUERY_USAGE;
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;
}
Expand Down
2 changes: 1 addition & 1 deletion loader/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project default="core" basedir="." name="Lucee"
xmlns:resolver="antlib:org.apache.maven.resolver.ant">

<property name="version" value="6.1.0.156-SNAPSHOT"/>
<property name="version" value="6.1.0.157-SNAPSHOT"/>

<taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
<classpath>
Expand Down
2 changes: 1 addition & 1 deletion loader/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>org.lucee</groupId>
<artifactId>lucee</artifactId>
<version>6.1.0.156-SNAPSHOT</version>
<version>6.1.0.157-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Lucee Loader Build</name>
Expand Down

0 comments on commit df45467

Please sign in to comment.