You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2008/03/19 21:11:19 UTC
svn commit: r638994 - in /geronimo/server/branches/2.1/plugins:
jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManagerImpl.java
tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatLogManagerImpl.java
Author: vamsic007
Date: Wed Mar 19 13:11:14 2008
New Revision: 638994
URL: http://svn.apache.org/viewvc?rev=638994&view=rev
Log:
GERONIMO-3879 Web Access Log Viewer problems in multiple server instances scenario
o Locate the logs under the server instance directory.
o Merging rev 638985 from trunk.
Modified:
geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManagerImpl.java
geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatLogManagerImpl.java
Modified: geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManagerImpl.java?rev=638994&r1=638993&r2=638994&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManagerImpl.java (original)
+++ geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/requestlog/JettyLogManagerImpl.java Wed Mar 19 13:11:14 2008
@@ -140,7 +140,7 @@
fileNamePattern = fileNamePattern.substring(fileNamePattern.lastIndexOf(FILE_SEPARATOR_WIN_STYLE) + 1);
}
- String logFile = serverInfo.resolvePath(logName);
+ String logFile = serverInfo.resolveServerPath(logName);
File parent = new File(logFile).getParentFile();
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatLogManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatLogManagerImpl.java?rev=638994&r1=638993&r2=638994&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatLogManagerImpl.java (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatLogManagerImpl.java Wed Mar 19 13:11:14 2008
@@ -137,7 +137,7 @@
fileNamePattern = fileNamePattern.substring(fileNamePattern.lastIndexOf(FILE_SEPARATOR_WIN_STYLE) + 1);
}
- String logFile = serverInfo.resolvePath(logName);
+ String logFile = serverInfo.resolveServerPath(logName);
File parent = new File(logFile).getParentFile();