diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-04-26 16:24:35 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-04-26 16:24:35 +0100 |
| commit | 2cdcc8c5f77331896757797a960ad901c3077a38 (patch) | |
| tree | e17bde754faf5c4cf74fb7bd336a0b906ae2c4a1 /packaging | |
| parent | c75b4aaebf0fb1ade23f4fb501584f27acc8c829 (diff) | |
| download | rabbitmq-server-2cdcc8c5f77331896757797a960ad901c3077a38.tar.gz | |
Rename the init script's rotate-logs target to reopen-logs
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.logrotate | 2 | ||||
| -rw-r--r-- | packaging/common/rabbitmq-server.init | 12 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/rabbitmq-server.logrotate | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.logrotate b/packaging/RPMS/Fedora/rabbitmq-server.logrotate index 6b657614..6ce02125 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 > /dev/null + /sbin/service rabbitmq-server reopen-logs > /dev/null endscript } diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init index d8a7a94d..15e3ee34 100644 --- a/packaging/common/rabbitmq-server.init +++ b/packaging/common/rabbitmq-server.init @@ -22,7 +22,6 @@ DAEMON=/usr/sbin/${NAME} CONTROL=/usr/sbin/rabbitmqctl DESC=rabbitmq-server USER=rabbitmq -ROTATE_SUFFIX= INIT_LOG_DIR=/var/log/rabbitmq LOCK_FILE= # This is filled in when building packages @@ -93,9 +92,10 @@ status_rabbitmq() { set -e } -rotate_logs_rabbitmq() { +reopen_logs_rabbitmq() { set +e - $CONTROL rotate_logs ${ROTATE_SUFFIX} + # Do not supply a suffix as we do not want to rotate the logs. + $CONTROL rotate_logs if [ $? != 0 ] ; then RETVAL=1 fi @@ -131,9 +131,9 @@ case "$1" in status) status_rabbitmq ;; - rotate-logs) + reopen-logs) echo -n "Rotating log files for $DESC: " - rotate_logs_rabbitmq + reopen_logs_rabbitmq ;; force-reload|reload|restart) echo -n "Restarting $DESC: " @@ -146,7 +146,7 @@ case "$1" in echo "$NAME." ;; *) - echo "Usage: $0 {start|stop|status|rotate-logs|restart|condrestart|try-restart|reload|force-reload}" >&2 + echo "Usage: $0 {start|stop|status|reopen-logs|restart|condrestart|try-restart|reload|force-reload}" >&2 RETVAL=1 ;; esac diff --git a/packaging/debs/Debian/debian/rabbitmq-server.logrotate b/packaging/debs/Debian/debian/rabbitmq-server.logrotate index c786df77..6c034ccf 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 > /dev/null + /etc/init.d/rabbitmq-server reopen-logs > /dev/null endscript } |