Greg Padgett has uploaded a new change for review. Change subject: packaging: compress log files using xz ......................................................................
packaging: compress log files using xz Compress logs using xz instead of gzip -9. Change-Id: I2487d1a2505a43aa525b8d0d7af3557ce357d685 Bug-Url: https://bugzilla.redhat.com/889795 Signed-off-by: Greg Padgett <[email protected]> --- M packaging/fedora/spec/ovirt-engine.spec.in M packaging/resources/ovirtlogrot.sh 2 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/11508/1 diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index cc04a9d..a7dde21 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -165,6 +165,7 @@ Requires: python-configobj Requires: python-cheetah Requires: ovirt-host-deploy-java +Requires: xz Requires: yum-plugin-versionlock Requires: ovirt-engine-cli diff --git a/packaging/resources/ovirtlogrot.sh b/packaging/resources/ovirtlogrot.sh index 2903944..30d0def 100755 --- a/packaging/resources/ovirtlogrot.sh +++ b/packaging/resources/ovirtlogrot.sh @@ -12,10 +12,10 @@ date=`date $dateformat` for i in `ls $logdir/{engine,server,jasperserver}.log.* -t`; do - m=`expr match $i .*gz` - if [ $m == 0 ] + m=`expr match $i '.*\(gz\|xz\)'` + if [ -z "$m" ] then - cat $i | gzip -9 > $i-${date}_`/bin/date +%N | cut -c6-`.gz && rm $i + cat $i | xz > $i-${date}_`/bin/date +%N | cut -c6-`.xz && rm $i fi done; @@ -24,10 +24,10 @@ # lastlogday=`date -d "$maxage hours ago" $dateformat` -for i in `ls $logdir/{engine,server,jasperserver}.log.*.gz`; do - timestamp=`echo $i | sed s/.*-// | sed 's/_.\{4\}\.gz$//'` +for i in `ls $logdir/{engine,server,jasperserver}.log.*.{gz,xz}`; do + timestamp=`echo $i | sed 's/.*-//; s/\.\(gz\|xz\)$//; s/_.\{4\}$//'` if [[ "$lastlogday" > "$timestamp" ]] then - rm -f $logdir/{engine,server,jasperserver}.log.*$timestamp.gz + rm -f $i fi done -- To view, visit http://gerrit.ovirt.org/11508 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2487d1a2505a43aa525b8d0d7af3557ce357d685 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
