Author: markt
Date: Wed Oct 8 14:05:22 2014
New Revision: 1630110
URL: http://svn.apache.org/r1630110
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47919
Extend the information logged when Tomcat starts to optionally include (enabled
by default) the values of key environment variables.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/listeners.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1630110&r1=1630109&r2=1630110&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Wed
Oct 8 14:05:22 2014
@@ -121,12 +121,22 @@ userConfig.error=Error deploying web app
userConfig.start=UserConfig: Processing START
userConfig.stop=UserConfig: Processing STOP
userConfig.deploy.threaded.error=Error waiting for multi-thread deployment of
user directories to complete
-versionLoggerListener.serverInfo.server.version=Server version: {0}
-versionLoggerListener.serverInfo.server.built =Server built: {0}
-versionLoggerListener.serverInfo.server.number =Server number: {0}
-versionLoggerListener.serverInfo.os.name =OS Name: {0}
-versionLoggerListener.serverInfo.os.version =OS Version: {0}
-versionLoggerListener.serverInfo.os.arch =Architecture: {0}
-versionLoggerListener.serverInfo.vm.version =JVM Version: {0}
-versionLoggerListener.serverInfo.vm.vendor =JVM Vendor: {0}
+versionLoggerListener.serverInfo.server.version=Server version: {0}
+versionLoggerListener.serverInfo.server.built =Server built: {0}
+versionLoggerListener.serverInfo.server.number =Server number: {0}
+versionLoggerListener.serverInfo.os.name =OS Name: {0}
+versionLoggerListener.serverInfo.os.version =OS Version: {0}
+versionLoggerListener.serverInfo.os.arch =Architecture: {0}
+versionLoggerListener.serverInfo.vm.version =JVM Version: {0}
+versionLoggerListener.serverInfo.vm.vendor =JVM Vendor: {0}
+versionLoggerListener.env.catalina.base =CATALINA_BASE: {0}
+versionLoggerListener.env.catalina.home =CATALINA_HOME: {0}
+versionLoggerListener.env.catalina.tmpdir =CATALINA_TMPDIR: {0}
+versionLoggerListener.env.java.home =JAVA_HOME: {0}
+versionLoggerListener.env.jre.home =JRE_HOME: {0}
+versionLoggerListener.env.runjava =_RUNJAVA: {0}
+versionLoggerListener.env.java.opts =JAVA_OPTS: {0}
+versionLoggerListener.env.catalina.opts =CATALINA_OPTS: {0}
+versionLoggerListener.env.java.endorsed =JAVA_ENDORSED_DIRS: {0}
+versionLoggerListener.env.classpath =CLASSPATH {0}
webAnnotationSet.invalidInjection=Invalid method resource injection annotation.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java?rev=1630110&r1=1630109&r2=1630110&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/VersionLoggerListener.java
Wed Oct 8 14:05:22 2014
@@ -37,6 +37,19 @@ public class VersionLoggerListener imple
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
+ private boolean logEnv = true;
+
+
+ public boolean getLogEnv() {
+ return logEnv;
+ }
+
+
+ public void setLogEnv(boolean logEnv) {
+ this.logEnv = logEnv;
+ }
+
+
@Override
public void lifecycleEvent(LifecycleEvent event) {
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
@@ -62,5 +75,28 @@ public class VersionLoggerListener imple
System.getProperty("java.runtime.version")));
log.info(sm.getString("versionLoggerListener.serverInfo.vm.vendor",
System.getProperty("java.vm.vendor")));
+
+ if (logEnv) {
+ log.info(sm.getString("versionLoggerListener.env.catalina.base",
+ System.getenv("CATALINA_BASE")));
+ log.info(sm.getString("versionLoggerListener.env.catalina.home",
+ System.getenv("CATALINA_HOME")));
+ log.info(sm.getString("versionLoggerListener.env.catalina.tmpdir",
+ System.getenv("CATALINA_TMPDIR")));
+ log.info(sm.getString("versionLoggerListener.env.java.home",
+ System.getenv("JAVA_HOME")));
+ log.info(sm.getString("versionLoggerListener.env.jre.home",
+ System.getenv("JRE_HOME")));
+ log.info(sm.getString("versionLoggerListener.env.runjava",
+ System.getenv("_RUNJAVA")));
+ log.info(sm.getString("versionLoggerListener.env.java.opts",
+ System.getenv("JAVA_OPTS")));
+ log.info(sm.getString("versionLoggerListener.env.catalina.opts",
+ System.getenv("CATALINA_OPTS")));
+ log.info(sm.getString("versionLoggerListener.env.java.endorsed",
+ System.getenv("JAVA_ENDORSED_DIRS")));
+ log.info(sm.getString("versionLoggerListener.env.classpath",
+ System.getenv("CLASSPATH")));
+ }
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1630110&r1=1630109&r2=1630110&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Oct 8 14:05:22 2014
@@ -58,6 +58,11 @@
<code>${classloader.hostName}</code> and
<code>${classloader.serviceName}</code>. (markt)
</add>
+ <add>
+ <bug>47919</bug>: Extend the information logged when Tomcat starts to
+ optionally include (enabled by default) the values of key environment
+ variables. (markt)
+ </add>
<fix>
<bug>55984</bug>: Using the allow separators in version 0 cookies
option
with the legacy cookie processor should only apply to version 0
cookies.
Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1630110&r1=1630109&r2=1630110&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Wed Oct 8 14:05:22 2014
@@ -395,8 +395,20 @@
<p>This listener must only be nested within <a
href="server.html">Server</a>
elements and should be the first listener defined.</p>
- <p>No additional attributes are supported by the <strong>Version Logging
- Lifecycle Listener</strong>.</p>
+ <p>The following additional attributes are supported by the <strong>Version
+ Logging Lifecycle Listener</strong>:</p>
+
+ <attributes>
+
+ <attribute name="logEnv" required="false">
+ <p>If <code>true</code>, a number of environment variables will be
+ logged after the version information including
+ <code>CATALINA_BASE</code>, <code>CATALINA_HOME</code> and
+ <code>JAVA_HOME</code>. If not specified, the default value of
+ <code>true</code> is used.</p>
+ </attribute>
+
+ </attributes>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
