testing log4j2 FastFile with dev log4j2 configuration

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1475765 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 994eade6414d642be39327cd4d7e7a0f631f32f7..5eb967ecf8ca57da2bf8b7cfcb6557cc7562fb92 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -78,6 +78,11 @@
       <artifactId>archiva-repository-admin-api</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.lmax</groupId>
+      <artifactId>disruptor</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.eclipse.sisu</groupId>
       <artifactId>org.eclipse.sisu.plexus</artifactId>
@@ -1009,6 +1014,7 @@
             <archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
             <archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
             <archiva.tmp.group.index.ttl>${archiva.groupIndexTtl}</archiva.tmp.group.index.ttl>
+            <Log4jContextSelector>org.apache.logging.log4j.core.async.AsyncLoggerContextSelector</Log4jContextSelector>
           </systemProperties>
           <additionalClasspathDirs>
             <additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
index 990436b2202acc866959ddec9f0852a0adc74591..675b386055de18ea89cabca2696e038da7b761d2 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
@@ -31,15 +31,15 @@
       <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n}" />
     </Console>
 
-    <!--RollingFile name="console" fileName="${logsDirectory}/archiva.log"
-                 filePattern="${logsDirectory}/archiva-%d{MM-dd-yyyy}.log">
+    <FastFile name="rolling" fileName="${logsDirectory}/archiva.log"
+                filePattern="${logsDirectory}/archiva-%d{MM-dd-yyyy}.log" immediateFlush="false" append="true">
       <PatternLayout>
         <pattern>%d [%t] %-5p %c %x - %m%n</pattern>
       </PatternLayout>
       <Policies>
         <TimeBasedTriggeringPolicy />
       </Policies>
-    </RollingFile-->
+    </FastFile>
 
   </appenders>
   <loggers>
@@ -52,47 +52,42 @@
     <logger name="org.apache.http.headers" level="debug"/>
     -->
 
+    <asyncLogger name="org.apache.archiva.indexer.search.MavenRepositorySearch" level="info"/>
 
-    <logger name="org.apache.archiva.indexer.search.MavenRepositorySearch" level="info"/>
+    <asyncLogger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils" level="info"/>
 
-    <logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils" level="info"/>
+    <asyncLogger name="JPOX" level="error"/>
 
-    <logger name="JPOX" level="error"/>
+    <asyncLogger name="org.apache.commons.configuration.DefaultConfigurationBuilder" level="error"/>
 
+    <asyncLogger name="org.apache.archiva.admin.repository.managed" level="info"/>
 
-    <logger name="org.apache.commons.configuration.DefaultConfigurationBuilder" level="error"/>
+    <asyncLogger name="org.springframework" level="info"/>
 
+    <asyncLogger name="org.codehaus.plexus" level="info"/>
 
-    <logger name="org.apache.archiva.admin.repository.managed" level="info"/>
+    <asyncLogger name="org.codehaus.redback" level="info"/>
 
-    <logger name="org.springframework" level="info"/>
+    <asyncLogger name="org.apache.cxf" level="info"/>
 
+    <asyncLogger name="org.quartz" level="info"/>
 
-    <logger name="org.codehaus.plexus" level="info"/>
+    <asyncLogger name="org.apache.archiva.indexer.merger" level="info"/>
 
+    <asyncLogger name="org.apache.archiva.metadata.repository.stats.DefaultRepositoryStatisticsManager" level="debug" />
 
-    <logger name="org.codehaus.redback" level="info"/>
+    <asyncLogger name="org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler" level="debug"/>
 
+    <asyncLogger name="org.apache.archiva.web.security.ArchivaAuthorizer" level="debug"/>
 
-    <logger name="org.apache.cxf" level="info"/>
+    <asyncLogger name="org.apache.archiva.redback.rest.services.DefaultRoleManagementService" level="debug"/>
 
-    <logger name="org.quartz" level="info"/>
+    <asyncLogger name="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry" level="debug"/>
 
-    <logger name="org.apache.archiva.indexer.merger" level="info"/>
-
-    <logger name="org.apache.archiva.metadata.repository.stats.DefaultRepositoryStatisticsManager" level="debug" />
-
-    <logger name="org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler" level="debug"/>
-
-    <logger name="org.apache.archiva.web.security.ArchivaAuthorizer" level="debug"/>
-
-    <logger name="org.apache.archiva.redback.rest.services.DefaultRoleManagementService" level="debug"/>
-
-    <logger name="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry" level="debug"/>
-
-    <root level="info">
+    <asyncRoot level="info" includeLocation="true">
       <appender-ref ref="console"/>
-    </root>
+      <appender-ref ref="rolling"/>
+    </asyncRoot>
   </loggers>
 </configuration>
 

diff --git a/pom.xml b/pom.xml
index 8002d1939c6e4bb59646b51f3c3bdce16973f9e0..33114e4ab716a8f999626bb9da7c2141c9a07eee 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -455,6 +455,12 @@
         <version>2.1-SNAPSHOT</version>
       </dependency>
 
+      <dependency>
+        <groupId>com.lmax</groupId>
+        <artifactId>disruptor</artifactId>
+        <version>3.0.1</version>
+      </dependency>
+
       <!--
       use this layer as some modules need to use maven apis
       until we find a better solution