Repository: archiva Updated Branches: refs/heads/master 0312f52d7 -> d533b8591
[MRM-1842] Remove per default log4j2 Async Logging Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/3df83d78 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/3df83d78 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/3df83d78 Branch: refs/heads/master Commit: 3df83d78af71feb050f0d184f789a78bb5859171 Parents: 0312f52 Author: Olivier Lamy <[email protected]> Authored: Tue May 6 12:28:44 2014 +1000 Committer: Olivier Lamy <[email protected]> Committed: Tue May 6 12:28:44 2014 +1000 ---------------------------------------------------------------------- .../src/main/resources/log4j2.xml | 48 ++++++++++---------- .../src/test/tomcat/log4j2-test.xml | 36 +++++++-------- 2 files changed, 42 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/3df83d78/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml index a20e8d9..db3222c 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml @@ -63,69 +63,69 @@ </appenders> <loggers> - <asyncLogger name="org.apache.archiva.redback.struts2.action.AuditEvent" additivity="false" level="info"> + <logger name="org.apache.archiva.redback.struts2.action.AuditEvent" additivity="false" level="info"> <appender-ref ref="redbackAuditLog" /> - </asyncLogger> + </logger> - <asyncLogger name="org.apache.archiva.AuditLog" additivity="false" level="info"> + <logger name="org.apache.archiva.AuditLog" additivity="false" level="info"> <appender-ref ref="auditlog" /> - </asyncLogger> + </logger> <!-- INFO level loggers can use the default - <asyncLogger name="org.apache.archiva.consumers" level="info"/> + <logger name="org.apache.archiva.consumers" level="info"/> - <asyncLogger name="org.apache.archiva" level="info"/> + <logger name="org.apache.archiva" level="info"/> - <asyncLogger name="org.quartz" level="info"/> + <logger name="org.quartz" level="info"/> - <asyncLogger name="org.apache.jasper" level="info"/> + <logger name="org.apache.jasper" level="info"/> - <asyncLogger name="com.opensymphony.xwork2" level="info"/> + <logger name="com.opensymphony.xwork2" level="info"/> - <asyncLogger name="org.apache.struts2" level="info"/> + <logger name="org.apache.struts2" level="info"/> --> <!-- WebDav objects --> - <asyncLogger name="org.apache.archiva.webdav.ArchivaDavResource" level="info"/> + <logger name="org.apache.archiva.webdav.ArchivaDavResource" level="info"/> - <asyncLogger name="org.apache.archiva.webdav.ArchivaDavResourceFactory" level="info"/> + <logger name="org.apache.archiva.webdav.ArchivaDavResourceFactory" level="info"/> <!-- squelch noisy objects (for now) --> - <asyncLogger name="org.apache.commons" level="warn"/> + <logger name="org.apache.commons" level="warn"/> - <asyncLogger name="net.sf.ehcache" level="warn"/> + <logger name="net.sf.ehcache" level="warn"/> <!-- retained for Redback --> - <asyncLogger name="JPOX" level="warn"/> + <logger name="JPOX" level="warn"/> - <asyncLogger name="JPOX.MetaData" level="error"/> + <logger name="JPOX.MetaData" level="error"/> - <asyncLogger name="JPOX.RDBMS.SQL" level="error"/> + <logger name="JPOX.RDBMS.SQL" level="error"/> - <asyncLogger name="SQL" level="error"/> + <logger name="SQL" level="error"/> - <asyncLogger name="org.apache.commons.configuration.DefaultConfigurationBuilder" level="error"/> + <logger name="org.apache.commons.configuration.DefaultConfigurationBuilder" level="error"/> <!-- debug wagon transfer --> <!-- - <asyncLogger name="org.apache.archiva.proxy.common" level="debug"/> + <logger name="org.apache.archiva.proxy.common" level="debug"/> --> <!-- apache httpclient debug content transfer verbose --> <!-- - <asyncLogger name="org.apache.http.wire" level="debug"/> + <logger name="org.apache.http.wire" level="debug"/> --> <!-- apache httpclient log headers --> <!-- - <asyncLogger name="org.apache.http.headers" level="debug"/> + <logger name="org.apache.http.headers" level="debug"/> --> - <asyncRoot level="info" includeLocation="true"> + <root level="info" includeLocation="true"> <appender-ref ref="rolling"/> - </asyncRoot> + </root> </loggers> </configuration> http://git-wip-us.apache.org/repos/asf/archiva/blob/3df83d78/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml ---------------------------------------------------------------------- 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 8dcb4e1..e4e860f 100644 --- 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 @@ -50,46 +50,46 @@ <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"/> + <logger name="org.apache.commons.configuration.DefaultConfigurationBuilder" level="error"/> - <asyncLogger name="org.apache.archiva.admin.repository.managed" level="info"/> + <logger name="org.apache.archiva.admin.repository.managed" level="info"/> - <asyncLogger name="org.springframework" level="info"/> + <logger name="org.springframework" level="info"/> - <asyncLogger name="org.codehaus.plexus" level="info"/> + <logger name="org.codehaus.plexus" level="info"/> - <asyncLogger name="org.codehaus.redback" level="info"/> + <logger name="org.codehaus.redback" level="info"/> - <asyncLogger name="org.apache.cxf" level="info"/> + <logger name="org.apache.cxf" level="info"/> - <asyncLogger name="org.quartz" level="info"/> + <logger name="org.quartz" level="info"/> - <asyncLogger name="org.apache.archiva.indexer.merger" level="info"/> + <logger name="org.apache.archiva.indexer.merger" level="info"/> - <asyncLogger name="org.apache.archiva.metadata.repository.stats.DefaultRepositoryStatisticsManager" level="debug" /> + <logger name="org.apache.archiva.metadata.repository.stats.DefaultRepositoryStatisticsManager" level="debug" /> - <asyncLogger name="org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler" level="debug"/> + <logger name="org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler" level="debug"/> - <asyncLogger name="org.apache.archiva.web.security.ArchivaAuthorizer" level="debug"/> + <logger name="org.apache.archiva.web.security.ArchivaAuthorizer" level="debug"/> - <asyncLogger name="org.apache.archiva.redback.rest.services.DefaultRoleManagementService" level="debug"/> + <logger name="org.apache.archiva.redback.rest.services.DefaultRoleManagementService" level="debug"/> - <asyncLogger name="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry" level="debug"/> + <logger name="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry" level="debug"/> <!-- <logger name="org.apache.archiva.scheduler.indexing" level="debug"/> --> - <asyncRoot level="info" includeLocation="true"> + <root level="info" includeLocation="true"> <appender-ref ref="console"/> <appender-ref ref="rolling"/> - </asyncRoot> + </root> </loggers> </configuration>
