Yaniv Dary has uploaded a new change for review.
Change subject: packaging: added strandard log rotate config file
......................................................................
packaging: added strandard log rotate config file
removed JRS default log rotation.
Change-Id: If78b204a139de079ca9eb70a1341ec0045c064ef
Signed-off-by: Yaniv Dary <yd...@redhat.com>
---
M .gitignore
M Makefile
M ovirt-engine-reports.spec.in
M packaging/jasper-war-patches/ce/900_004_props_change_logs_location.patch.in
M packaging/jasper-war-patches/pro/900_004_props_change_logs_location.patch.in
A packaging/sys-etc/logrotate.d/jasperserver.in
6 files changed, 40 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/10/26210/1
diff --git a/.gitignore b/.gitignore
index 8ccb937..89b4ade 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
packaging/jasper-war-patches/pro/900_004_props_change_logs_location.patch
packaging/setup/ovirt_engine_setup/reportsconfig.py
packaging/sys-etc/ovirt-engine/engine.conf.d/20-ovirt-engine-reports.conf
+packaging/sys-etc/logrotate.d/jasperserver
diff --git a/Makefile b/Makefile
index c91d236..f134371 100644
--- a/Makefile
+++ b/Makefile
@@ -98,6 +98,7 @@
packaging/jasper-war-patches/ce/900_004_props_change_logs_location.patch \
packaging/jasper-war-patches/pro/900_004_props_change_logs_location.patch \
packaging/setup/ovirt_engine_setup/reportsconfig.py \
+ packaging/sys-etc/logrotate.d/jasperserver \
packaging/sys-etc/ovirt-engine/engine.conf.d/20-ovirt-engine-reports.conf \
$(NULL)
diff --git a/ovirt-engine-reports.spec.in b/ovirt-engine-reports.spec.in
index 9fdc8e8..3eef232 100644
--- a/ovirt-engine-reports.spec.in
+++ b/ovirt-engine-reports.spec.in
@@ -50,6 +50,7 @@
Requires: jasperreports-server%{reports_jasper_suffix} >= 5.5.0-6
Requires: java
Requires: jpackage-utils
+Requires: logrotate
Requires: m2crypto
Requires: %{engine_name} >= 3.4.0
Requires: patch
@@ -110,6 +111,7 @@
fi
%files
+%config(noreplace) %{_sysconfdir}/logrotate.d/jasperserver
%dir %attr(-, %{engine_user}, %{engine_group})
%{_localstatedir}/lib/%{reports_name}
%dir %attr(-, %{engine_user}, %{engine_group})
%{_localstatedir}/log/%{reports_name}
%{_localstatedir}/lib/ovirt-engine-reports/backups/
diff --git
a/packaging/jasper-war-patches/ce/900_004_props_change_logs_location.patch.in
b/packaging/jasper-war-patches/ce/900_004_props_change_logs_location.patch.in
index a51eb05..4e77d44 100644
---
a/packaging/jasper-war-patches/ce/900_004_props_change_logs_location.patch.in
+++
b/packaging/jasper-war-patches/ce/900_004_props_change_logs_location.patch.in
@@ -1,20 +1,23 @@
--- a/WEB-INF/log4j.properties
+++ b/WEB-INF/log4j.properties
-@@ -39,7 +39,7 @@ log4j.appender.stdout.layout.conversionP
+@@ -39,8 +39,7 @@ log4j.appender.stdout.layout.conversionPattern=%d{ISO8601}
%5p %c{1},%t:%L - %m%
# jasperserver.root is used only by JasperServer Community Edition.
# JasperServer Professional users should look for jasperserver-pro.root lower
in this file.
log4j.appender.fileout=org.apache.log4j.RollingFileAppender
--log4j.appender.fileout.File=${ovirt-engine-reports.root}/WEB-INF/logs/jasperserver.log
+-log4j.appender.fileout.File=${jasperserver.root}/WEB-INF/logs/jasperserver.log
+-log4j.appender.fileout.MaxFileSize=1024KB
+log4j.appender.fileout.File=@PKG_LOG_DIR@/jasperserver.log
- log4j.appender.fileout.MaxFileSize=1024KB
log4j.appender.fileout.MaxBackupIndex=1
log4j.appender.fileout.layout=org.apache.log4j.PatternLayout
-@@ -64,7 +64,7 @@ log4j.appender.fileout.layout.conversion
+ # Valid date format specifiers for the conversionPattern include "ABSOLUTE",
"DATE" and "ISO8601"
+@@ -64,8 +63,7 @@ log4j.appender.fileout.layout.conversionPattern=%d{ISO8601}
%5p %c{1},%t:%L - %m
# jasperserver.root is used only by JasperServer Community Edition.
# JasperServer Professional users should look for jasperserver-pro.root lower
in this file.
log4j.appender.jasperanalysis=org.apache.log4j.RollingFileAppender
--log4j.appender.jasperanalysis.File=${ovirt-engine-reports.root}/WEB-INF/logs/jasperanalysis.log
+-log4j.appender.jasperanalysis.File=${jasperserver.root}/WEB-INF/logs/jasperanalysis.log
+-log4j.appender.jasperanalysis.MaxFileSize=1024KB
+log4j.appender.jasperanalysis.File=@PKG_LOG_DIR@/jasperanalysis.log
- log4j.appender.jasperanalysis.MaxFileSize=1024KB
log4j.appender.jasperanalysis.MaxBackupIndex=1
log4j.appender.jasperanalysis.layout=org.apache.log4j.PatternLayout
+ # Valid date format specifiers for the conversionPattern include "ABSOLUTE",
"DATE" and "ISO8601"
+
\ No newline at end of file
diff --git
a/packaging/jasper-war-patches/pro/900_004_props_change_logs_location.patch.in
b/packaging/jasper-war-patches/pro/900_004_props_change_logs_location.patch.in
index 0389e4d..58130e2 100644
---
a/packaging/jasper-war-patches/pro/900_004_props_change_logs_location.patch.in
+++
b/packaging/jasper-war-patches/pro/900_004_props_change_logs_location.patch.in
@@ -1,13 +1,30 @@
--- a/WEB-INF/log4j.properties
+++ b/WEB-INF/log4j.properties
-@@ -139,8 +139,8 @@ log4j.logger.IntrusionDetector=ERROR
+@@ -40,7 +40,6 @@ log4j.appender.stdout.layout.conversionPattern=%d{ISO8601}
%5p %c{1},%t:%L - %m%
+ # JasperServer Professional users should look for jasperserver-pro.root lower
in this file.
+ log4j.appender.fileout=org.apache.log4j.RollingFileAppender
+ log4j.appender.fileout.File=${jasperserver.root}/WEB-INF/logs/jasperserver.log
+-log4j.appender.fileout.MaxFileSize=1024KB
+ log4j.appender.fileout.MaxBackupIndex=1
+ log4j.appender.fileout.layout=org.apache.log4j.PatternLayout
+ # Valid date format specifiers for the conversionPattern include "ABSOLUTE",
"DATE" and "ISO8601"
+@@ -65,7 +64,6 @@ log4j.appender.fileout.layout.conversionPattern=%d{ISO8601}
%5p %c{1},%t:%L - %m
+ # JasperServer Professional users should look for jasperserver-pro.root lower
in this file.
+ log4j.appender.jasperanalysis=org.apache.log4j.RollingFileAppender
+
log4j.appender.jasperanalysis.File=${jasperserver.root}/WEB-INF/logs/jasperanalysis.log
+-log4j.appender.jasperanalysis.MaxFileSize=1024KB
+ log4j.appender.jasperanalysis.MaxBackupIndex=1
+ log4j.appender.jasperanalysis.layout=org.apache.log4j.PatternLayout
+ # Valid date format specifiers for the conversionPattern include "ABSOLUTE",
"DATE" and "ISO8601"
+@@ -139,8 +137,8 @@ log4j.logger.IntrusionDetector=ERROR
#log4j.logger.com.jaspersoft.jasperserver.jaxrs.importexport.ImportJaxrsService=DEBUG#
overriding fileout location
# jasperserver-pro.root is used only by JasperServer Professional.
# JasperServer Community Edition users should look for jasperserver.root
above in this file.
--log4j.appender.fileout.File=${ovirt-engine-reports.root}/WEB-INF/logs/jasperserver.log
--log4j.appender.jasperanalysis.File=${ovirt-engine-reports.root}/WEB-INF/logs/jasperanalysis.log
+-log4j.appender.fileout.File=${jasperserver-pro.root}/WEB-INF/logs/jasperserver.log
+-log4j.appender.jasperanalysis.File=${jasperserver-pro.root}/WEB-INF/logs/jasperanalysis.log
+log4j.appender.fileout.File=@PKG_LOG_DIR@/jasperserver.log
+log4j.appender.jasperanalysis.File=@PKG_LOG_DIR@/jasperanalysis.log
## Show some audit related warnings
log4j.logger.com.jaspersoft.ji.logging.context=warn
+
\ No newline at end of file
diff --git a/packaging/sys-etc/logrotate.d/jasperserver.in
b/packaging/sys-etc/logrotate.d/jasperserver.in
new file mode 100644
index 0000000..719f5ec
--- /dev/null
+++ b/packaging/sys-etc/logrotate.d/jasperserver.in
@@ -0,0 +1,7 @@
+@PKG_LOG_DIR@/jasperserver.log {
+ size 10M
+ missingok
+ copytruncate
+ rotate 5
+ compress
+}
--
To view, visit http://gerrit.ovirt.org/26210
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If78b204a139de079ca9eb70a1341ec0045c064ef
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Yaniv Dary <yd...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
