Author: kkolinko
Date: Fri Jan 23 10:08:52 2015
New Revision: 1654161
URL: http://svn.apache.org/r1654161
Log:
Allow to log the system properties with VersionLoggerListener. This feature is
off by default.
Merged r1654159 from tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/listeners.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 23 10:08:52 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1654161&r1=1654160&r2=1654161&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Fri Jan 23 10:08:52 2015
@@ -132,6 +132,7 @@ versionLoggerListener.vm.version
versionLoggerListener.vm.vendor =JVM Vendor: {0}
versionLoggerListener.catalina.base =CATALINA_BASE: {0}
versionLoggerListener.catalina.home =CATALINA_HOME: {0}
-versionLoggerListener.env =Environment variable: {0} =
{1}
versionLoggerListener.arg =Command line argument: {0}
+versionLoggerListener.env =Environment variable: {0} =
{1}
+versionLoggerListener.prop =System property: {0} =
{1}
webAnnotationSet.invalidInjection=Invalid method resource injection annotation.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java?rev=1654161&r1=1654160&r2=1654161&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java
Fri Jan 23 10:08:52 2015
@@ -19,8 +19,8 @@ package org.apache.catalina.startup;
import java.lang.management.ManagementFactory;
import java.util.List;
import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import java.util.SortedMap;
+import java.util.TreeMap;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
@@ -44,6 +44,7 @@ public class VersionLoggerListener imple
private boolean logArgs = true;
private boolean logEnv = false;
+ private boolean logProps = false;
public boolean getLogArgs() {
@@ -66,6 +67,16 @@ public class VersionLoggerListener imple
}
+ public boolean getLogProps() {
+ return logProps;
+ }
+
+
+ public void setLogProps(boolean logProps) {
+ this.logProps = logProps;
+ }
+
+
@Override
public void lifecycleEvent(LifecycleEvent event) {
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
@@ -106,10 +117,19 @@ public class VersionLoggerListener imple
}
if (logEnv) {
- Map<String,String> envs = System.getenv();
- SortedSet<String> keys = new TreeSet<>(envs.keySet());
- for (String key : keys) {
- log.info(sm.getString("versionLoggerListener.env", key,
envs.get(key)));
+ SortedMap<String, String> sortedMap = new
TreeMap<>(System.getenv());
+ for (Map.Entry<String, String> e : sortedMap.entrySet()) {
+ log.info(sm.getString("versionLoggerListener.env", e.getKey(),
e.getValue()));
+ }
+ }
+
+ if (logProps) {
+ SortedMap<String, String> sortedMap = new TreeMap<>();
+ for (Map.Entry<Object, Object> e :
System.getProperties().entrySet()) {
+ sortedMap.put(String.valueOf(e.getKey()),
String.valueOf(e.getValue()));
+ }
+ for (Map.Entry<String, String> e : sortedMap.entrySet()) {
+ log.info(sm.getString("versionLoggerListener.prop",
e.getKey(), e.getValue()));
}
}
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1654161&r1=1654160&r2=1654161&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Fri Jan 23 10:08:52 2015
@@ -102,6 +102,10 @@
Ensure that when static resources are served from JARs, only static
resources are served. (markt)
</fix>
+ <add>
+ Allow <code>VersionLoggerListener</code> to log all system properties.
+ This feature is off by default. (kkolinko)
+ </add>
</changelog>
</subsection>
<subsection name="Jasper">
Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/listeners.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/listeners.xml?rev=1654161&r1=1654160&r2=1654161&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/listeners.xml Fri Jan 23 10:08:52
2015
@@ -446,6 +446,12 @@
<code>false</code> will be used.</p>
</attribute>
+ <attribute name="logProps" required="false">
+ <p>If <code>true</code>, the current Java system properties will be
+ logged. If not specified, the default value of
+ <code>false</code> will be used.</p>
+ </attribute>
+
</attributes>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
