diff options
| author | Simon MacMullen <simon@lshift.net> | 2009-02-20 14:35:02 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@lshift.net> | 2009-02-20 14:35:02 +0000 |
| commit | 13344e17280377bb45350b8beadba41f7361a2d1 (patch) | |
| tree | 8868f111cdfe414dc20ece4c0ecefa1784ef23d3 | |
| parent | 37535fd14622a567ac20381a75daa24d20eaf4a5 (diff) | |
| parent | 127d7605a1b5d3ec0797e42d43b93d2a6d0cbd86 (diff) | |
| download | rabbitmq-server-13344e17280377bb45350b8beadba41f7361a2d1.tar.gz | |
Merged 20383
| -rw-r--r-- | packaging/RPMS/Fedora/init.d | 5 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.logrotate | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/init.d | 5 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/rabbitmq-server.logrotate | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/packaging/RPMS/Fedora/init.d b/packaging/RPMS/Fedora/init.d index 9f4dbb43..9223ae1a 100644 --- a/packaging/RPMS/Fedora/init.d +++ b/packaging/RPMS/Fedora/init.d @@ -90,7 +90,10 @@ status_rabbitmq() { rotate_logs_rabbitmq() { set +e - $DAEMON rotate_logs ${ROTATE_SUFFIX} 2>&1 + $DAEMON rotate_logs ${ROTATE_SUFFIX} + if [ $? != 0 ] ; then + RETVAL=1 + fi set -e } diff --git a/packaging/RPMS/Fedora/rabbitmq-server.logrotate b/packaging/RPMS/Fedora/rabbitmq-server.logrotate index ab87e4a5..6b657614 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.logrotate +++ b/packaging/RPMS/Fedora/rabbitmq-server.logrotate @@ -7,6 +7,6 @@ notifempty sharedscripts postrotate - /sbin/service rabbitmq-server rotate-logs + /sbin/service rabbitmq-server rotate-logs > /dev/null endscript } diff --git a/packaging/debs/Debian/debian/init.d b/packaging/debs/Debian/debian/init.d index aff0ce4d..ef66add5 100644 --- a/packaging/debs/Debian/debian/init.d +++ b/packaging/debs/Debian/debian/init.d @@ -79,7 +79,10 @@ status_rabbitmq() { rotate_logs_rabbitmq() { set +e - $DAEMON rotate_logs ${ROTATE_SUFFIX} 2>&1 + $DAEMON rotate_logs ${ROTATE_SUFFIX} + if [ $? != 0 ] ; then + RETVAL=1 + fi set -e } diff --git a/packaging/debs/Debian/debian/rabbitmq-server.logrotate b/packaging/debs/Debian/debian/rabbitmq-server.logrotate index bfd6b8da..c786df77 100644 --- a/packaging/debs/Debian/debian/rabbitmq-server.logrotate +++ b/packaging/debs/Debian/debian/rabbitmq-server.logrotate @@ -7,6 +7,6 @@ notifempty sharedscripts postrotate - /etc/init.d/rabbitmq-server rotate-logs + /etc/init.d/rabbitmq-server rotate-logs > /dev/null endscript } |