Author: olamy
Date: Thu May 2 13:20:34 2013
New Revision: 1478363
URL: http://svn.apache.org/r1478363
Log:
[MRM-1760] Multiple, incompatible, log name formats
Modified:
archiva/trunk/archiva-jetty/pom.xml
archiva/trunk/archiva-jetty/src/main/conf/jetty.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
Modified: archiva/trunk/archiva-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/pom.xml?rev=1478363&r1=1478362&r2=1478363&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/pom.xml (original)
+++ archiva/trunk/archiva-jetty/pom.xml Thu May 2 13:20:34 2013
@@ -121,7 +121,7 @@
</property>
<property>
<name>wrapper.logfile</name>
- <value>%ARCHIVA_BASE%/logs/wrapper.YYYYMMDD.log</value>
+ <value>%ARCHIVA_BASE%/logs/wrapper-YYYYMMDD.log</value>
</property>
<property>
<name>wrapper.logfile.rollmode</name>
Modified: archiva/trunk/archiva-jetty/src/main/conf/jetty.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/src/main/conf/jetty.xml?rev=1478363&r1=1478362&r2=1478363&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/src/main/conf/jetty.xml (original)
+++ archiva/trunk/archiva-jetty/src/main/conf/jetty.xml Thu May 2 13:20:34 2013
@@ -179,8 +179,8 @@
<Ref id="RequestLog">
<Set name="requestLog">
<New id="RequestLogImpl"
class="org.eclipse.jetty.server.NCSARequestLog">
- <Set name="filename"><SystemProperty name="jetty.logs"
default="./logs"/>/yyyy_mm_dd.request.log</Set>
- <Set name="filenameDateFormat">yyyy_MM_dd</Set>
+ <Set name="filename"><SystemProperty name="jetty.logs"
default="./logs"/>/request-yyyy_mm_dd.log</Set>
+ <Set name="filenameDateFormat">yyyyMMdd</Set>
<Set name="retainDays">90</Set>
<Set name="append">true</Set>
<Set name="extended">true</Set>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml?rev=1478363&r1=1478362&r2=1478363&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
Thu May 2 13:20:34 2013
@@ -28,7 +28,7 @@
<appenders>
<FastRollingFile name="rolling" fileName="${logsDirectory}/archiva.log"
- filePattern="${logsDirectory}/archiva-%d{MM-dd-yyyy}.log"
+ filePattern="${logsDirectory}/archiva-%d{yyyyMMdd}.log"
immediateFlush="false" append="true">
<PatternLayout>
<pattern>%d [%t] %-5p %c %x - %m%n</pattern>
@@ -39,7 +39,7 @@
</FastRollingFile>
<FastRollingFile name="auditlog"
fileName="${logsDirectory}/archiva-audit.log"
-
filePattern="${logsDirectory}/archiva-audit-%d{MM-dd-yyyy}.log"
+ filePattern="${logsDirectory}/archiva-audit-%d{yyyyMMdd}.log"
immediateFlush="false" append="true">
<PatternLayout>
<pattern>%d{yyyy-MM-dd HH:mm:ss} %m%n</pattern>
@@ -50,7 +50,7 @@
</FastRollingFile>
<FastRollingFile name="redbackAuditLog"
fileName="${logsDirectory}/archiva-security-audit.log"
-
filePattern="${logsDirectory}/archiva-security-audit.log-%d{MM-dd-yyyy}.log"
+
filePattern="${logsDirectory}/archiva-security-audit.log-%d{yyyyMMdd}.log"
immediateFlush="false" append="true">
<PatternLayout>
<pattern>%d{yyyy-MM-dd HH:mm:ss} - %X{redback.currentUser} -
%m%n</pattern>
