Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: log rotate ......................................................................
packaging: log rotate use standard logrotate instead of own implementation, disable jboss rotation in favor of logrotate. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=948481 Change-Id: I3570ae0e07a6884dcfc47bc49795f2ad17ab6c43 Signed-off-by: Alon Bar-Lev <alo...@redhat.com> --- M .gitignore M Makefile M ovirt-engine.spec.in A packaging/etc/logrotate.d/ovirt-engine.in D packaging/resources/ovirt-cron D packaging/resources/ovirtlogrot.sh M packaging/services/ovirt-engine.xml.in 7 files changed, 28 insertions(+), 60 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/14961/1 diff --git a/.gitignore b/.gitignore index 2a15836..14792d5 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ packaging/bin/engine-prolog.sh packaging/conf/engine.conf.defaults packaging/conf/notifier.conf.defaults +packaging/etc/logrotate.d/ovirt-engine packaging/etc/engine-config/log4j.xml packaging/etc/engine-manage-domains/log4j.xml packaging/etc/engine-manage-domains/engine-manage-domains.conf diff --git a/Makefile b/Makefile index 0a34e09..168f88d 100644 --- a/Makefile +++ b/Makefile @@ -151,6 +151,7 @@ packaging/bin/engine-prolog.sh \ packaging/conf/engine.conf.defaults \ packaging/conf/notifier.conf.defaults \ + packaging/etc/logrotate.d/ovirt-engine \ packaging/etc/engine-config/log4j.xml \ packaging/etc/engine-manage-domains/log4j.xml \ packaging/etc/engine-manage-domains/engine-manage-domains.conf \ @@ -273,7 +274,6 @@ @install -dm 755 $(DESTDIR)$(PYTHON_DIR)/sos/plugins @install -dm 755 $(DESTDIR)$(PKG_SYSCONF_DIR)/engine-config @install -dm 755 $(DESTDIR)$(PKG_SYSCONF_DIR)/engine-manage-domains - @install -dm 755 $(DESTDIR)$(SYSCONF_DIR)/cron.daily @install -dm 755 $(DESTDIR)$(SYSCONF_DIR)/rc.d/init.d @install -dm 755 $(DESTDIR)$(SYSCONF_DIR)/firewalld/services @@ -442,8 +442,6 @@ install -m 644 packaging/conf/engine.conf.defaults $(DESTDIR)$(DATA_DIR)/conf install -m 644 packaging/etc/engine.conf $(DESTDIR)$(PKG_SYSCONF_DIR)/ install -dm 755 $(DESTDIR)$(PKG_SYSCONF_DIR)/engine.conf.d - install -m 755 packaging/resources/ovirtlogrot.sh ${DESTDIR}$(DATA_DIR)/scripts/ - install -m 755 packaging/resources/ovirt-cron ${DESTDIR}$(SYSCONF_DIR)/cron.daily/ # Service common install -dm 755 $(DESTDIR)$(DATA_DIR)/services @@ -473,6 +471,8 @@ install -m 755 packaging/services/ovirt-engine.py $(DESTDIR)$(DATA_DIR)/services install -m 755 packaging/services/ovirt-engine.systemd $(DESTDIR)$(DATA_DIR)/services install -m 755 packaging/services/ovirt-engine.sysv $(DESTDIR)$(DATA_DIR)/services + install -dm 755 $(DESTDIR)$(SYSCONF_DIR)/logrotate.d + install -m 644 packaging/etc/logrotate.d/ovirt-engine $(DESTDIR)$(SYSCONF_DIR)/logrotate.d install-dev: [ "$(DEV_REBUILD)" != 0 ] && rm -f "$(BUILD_FILE)" || : diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index fe7d6c3..b3709bb 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -156,7 +156,6 @@ Requires: policycoreutils-python Requires: python-cheetah Requires: ovirt-host-deploy-java -Requires: xz Requires: yum-plugin-versionlock # For local database: @@ -207,6 +206,7 @@ Requires: java Requires: openssh Requires: openssl +Requires: logrotate %if %{install_systemd} Requires(post): systemd @@ -506,10 +506,6 @@ %dir %attr(-, %{engine_user}, %{engine_group}) %{engine_log} %dir %attr(-, %{engine_user}, %{engine_group}) %{engine_cache} -# Log rotation script: -%{engine_data}/scripts/ovirtlogrot.sh -%{_sysconfdir}/cron.daily/ovirt-cron - %dir %{engine_data}/conf # Engine configuration files: @@ -561,6 +557,7 @@ %dir %{engine_data}/ui-plugins # Files needed by the service: +%config %{_sysconfdir}/logrotate.d/ovirt-engine %{engine_data}/services/ovirt-engine.* %{engine_data}/services/ovirt-engine-logging.properties.in %if %{install_systemd} diff --git a/packaging/etc/logrotate.d/ovirt-engine.in b/packaging/etc/logrotate.d/ovirt-engine.in new file mode 100644 index 0000000..294be37 --- /dev/null +++ b/packaging/etc/logrotate.d/ovirt-engine.in @@ -0,0 +1,18 @@ +"@ENGINE_LOG@/engine.log" "@ENGINE_LOG@/server.log" { + minsize 10M + size 100M + missingok + copytruncate + rotate 5 + compress +} + +"@ENGINE_LOG@/host-deploy"/*.log { + monthly + missingok + rotate 2 + compress + postrotate + rm -f "$1" + endscript +} diff --git a/packaging/resources/ovirt-cron b/packaging/resources/ovirt-cron deleted file mode 100644 index 5ad6f9b..0000000 --- a/packaging/resources/ovirt-cron +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -#compress log4j log files, delete old ones -/usr/share/ovirt-engine/scripts/ovirtlogrot.sh /var/log/ovirt-engine 480 > /dev/null - -EXITVALUE=$? -if [ $EXITVALUE != 0 ]; then - /usr/bin/logger -t ovirt-engine "ALERT exited abnormally with [$EXITVALUE]" -fi -exit $EXITVALUE - diff --git a/packaging/resources/ovirtlogrot.sh b/packaging/resources/ovirtlogrot.sh deleted file mode 100755 index 1e347c7..0000000 --- a/packaging/resources/ovirtlogrot.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# Archives the log files of ovirt -# usage: -# ovirtlogrot.sh <log directory> <max log age in hours> -# - -logdir=$1 -maxage=$2 -dateformat="+%Y%m%d_%H%M%S" - -date=`date $dateformat` - -for i in $logdir/{engine,server,jasperserver}.log.*; do - m=`expr match $i '.*\(gz\|xz\)'` - if [ -z "$m" -a -r "$i" ] - then - cat $i | xz > $i-${date}_`/bin/date +%N | cut -c6-`.xz && rm $i - fi -done; - -# -# remove the old logs -# - -lastlogday=`date -d "$maxage hours ago" $dateformat` -for i in $logdir/{engine,server,jasperserver}.log.*.{gz,xz}; do - timestamp=`echo $i | sed 's/.*-//; s/\.\(gz\|xz\)$//; s/_.\{4\}$//'` - if [[ "$lastlogday" > "$timestamp" ]] - then - rm -f $i - fi -done diff --git a/packaging/services/ovirt-engine.xml.in b/packaging/services/ovirt-engine.xml.in index eb39d2d..d924a99 100644 --- a/packaging/services/ovirt-engine.xml.in +++ b/packaging/services/ovirt-engine.xml.in @@ -40,27 +40,23 @@ <subsystem xmlns="urn:jboss:domain:logging:1.1"> <!-- All the application server messages go here: --> - <size-rotating-file-handler name="SERVER"> + <file-handler name="SERVER"> <formatter> <pattern-formatter pattern="%d %-5p [%c] (%t) %s%E%n"/> </formatter> <file path="$getString('ENGINE_LOG')/server.log"/> - <rotate-size value="10M"/> - <max-backup-index value="30"/> <append value="true"/> - </size-rotating-file-handler> + </file-handler> <!-- Only the engine messages go here: --> - <size-rotating-file-handler name="ENGINE" autoflush="true"> + <file-handler name="ENGINE" autoflush="true"> <level name="INFO"/> <formatter> <pattern-formatter pattern="%d %-5p [%c] (%t) %s%E%n"/> </formatter> <file path="$getString('ENGINE_LOG')/engine.log"/> - <rotate-size value="10M"/> - <max-backup-index value="30"/> <append value="true"/> - </size-rotating-file-handler> + </file-handler> <!-- Loggers for the application server: --> <logger category="com.arjuna"> -- To view, visit http://gerrit.ovirt.org/14961 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3570ae0e07a6884dcfc47bc49795f2ad17ab6c43 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
