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 2022/04/10 21:56:21 UTC
[archiva] branch master updated: add a Delete action to delete logs older than 30D (#64)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/master by this push:
new eb489a1de add a Delete action to delete logs older than 30D (#64)
eb489a1de is described below
commit eb489a1deedf3366325922b29473c8b2302f9fce
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Mon Apr 11 07:53:28 2022 +1000
add a Delete action to delete logs older than 30D (#64)
* delete old logs files
* do not fork compilation
Signed-off-by: Olivier Lamy <ol...@apache.org>
---
Jenkinsfile | 2 +-
.../archiva-webapp/src/main/resources/log4j2.xml | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 91354a681..c15f75642 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -106,7 +106,7 @@ pipeline {
// -Dmaven.compiler.fork=true: Do compile in a separate forked process
// -Dmaven.test.failure.ignore=true: Do not stop, if some tests fail
// -Pci-build: Profile for CI-Server
- sh "mvn ${cmdLine} -B -U -e -fae -Dorg.slf4j.simpleLogger.showThreadName=true -Dmaven.compiler.fork=true -Pci-build -T${THREADS}"
+ sh "mvn ${cmdLine} -B -U -e -fae -Dorg.slf4j.simpleLogger.showThreadName=true -Pci-build -T${THREADS}"
}
}
}
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 7f12f2f6c..6d18560b2 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
@@ -36,6 +36,13 @@
<Policies>
<TimeBasedTriggeringPolicy />
</Policies>
+ <DefaultRolloverStrategy max="30">
+ <Delete basePath="${logsDirectory}" maxDepth="2">
+ <IfFileName glob="*/*.log">
+ <IfLastModified age="P30D"/>
+ </IfFileName>
+ </Delete>
+ </DefaultRolloverStrategy>
</RollingRandomAccessFile>
<RollingRandomAccessFile name="auditlog" fileName="${logsDirectory}/archiva-audit.log"
@@ -47,6 +54,13 @@
<Policies>
<TimeBasedTriggeringPolicy />
</Policies>
+ <DefaultRolloverStrategy max="30">
+ <Delete basePath="${logsDirectory}" maxDepth="2">
+ <IfFileName glob="*/*.log">
+ <IfLastModified age="P30D"/>
+ </IfFileName>
+ </Delete>
+ </DefaultRolloverStrategy>
</RollingRandomAccessFile>
<RollingRandomAccessFile name="redbackAuditLog" fileName="${logsDirectory}/archiva-security-audit.log"