You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/04/17 01:38:05 UTC

git commit: [MRM-1829] Change default value of of AysncLogger strategy for log4j async

Repository: archiva
Updated Branches:
  refs/heads/master 9dcb92bed -> b2ebfd6cc


[MRM-1829] Change default value of of AysncLogger strategy for log4j async


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/b2ebfd6c
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/b2ebfd6c
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/b2ebfd6c

Branch: refs/heads/master
Commit: b2ebfd6cc257b7040644dc52e38aa5b8c4faaa4e
Parents: 9dcb92b
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 17 09:37:38 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 17 09:37:38 2014 +1000

----------------------------------------------------------------------
 archiva-jetty/pom.xml                              | 3 ++-
 archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/b2ebfd6c/archiva-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 6a6cb15..fa76d9b 100644
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -177,7 +177,8 @@
                   -->
                   <systemProperty>jetty.logs=%ARCHIVA_BASE%/logs</systemProperty>
                   <systemProperty>java.io.tmpdir=%ARCHIVA_BASE%/temp</systemProperty>
-                  <systemProperty>AsyncLoggerConfig.WaitStrategy=Sleep</systemProperty>
+                  <systemProperty>AsyncLoggerConfig.WaitStrategy=Block</systemProperty>
+                  <systemProperty>AsyncLoggerConfig.WaitStrategy=Block</systemProperty>
                   <systemProperty>archiva.repositorySessionFactory.id=jcr</systemProperty>
                   <systemProperty>archiva.cassandra.configuration.file=%ARCHIVA_BASE%/conf/archiva-cassandra.properties</systemProperty>
                 </systemProperties>

http://git-wip-us.apache.org/repos/asf/archiva/blob/b2ebfd6c/archiva-modules/archiva-web/archiva-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index b82b868..70dcf98 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -1015,6 +1015,8 @@
             <cassandra.port>${cassandra.port}</cassandra.port>
             <archiva.repositorySessionFactory.id>${archiva.repositorySessionFactory.id}</archiva.repositorySessionFactory.id>
             <org.apache.sirona.configuration.sirona.properties>${archiva.sirona.configuration}</org.apache.sirona.configuration.sirona.properties>
+            <AsyncLoggerConfig.WaitStrategy>Block</AsyncLoggerConfig.WaitStrategy>
+            <AsyncLogger.WaitStrategy>Block</AsyncLogger.WaitStrategy>
           </systemProperties>
           <additionalClasspathDirs>
             <additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>