diff options
| author | Steve Losh <tim@rabbitmq.com> | 2012-06-14 12:22:51 +0100 |
|---|---|---|
| committer | Steve Losh <tim@rabbitmq.com> | 2012-06-14 12:22:51 +0100 |
| commit | debf4fc19a51c29585ffe6c6d2000ee85354f1da (patch) | |
| tree | 01876d9e725429010b70096f1658003c22e74eef /packaging | |
| parent | 36dddc9143f67136fa536c569123796d3ca23a3e (diff) | |
| parent | c9ada0cecf4e86e93071fba7fcc9a69bd098d888 (diff) | |
| download | rabbitmq-server-git-debf4fc19a51c29585ffe6c6d2000ee85354f1da.tar.gz | |
merge default
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/debs/Debian/debian/control | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/rabbitmq-server.init | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control index e935acf531..943ed48fa2 100644 --- a/packaging/debs/Debian/debian/control +++ b/packaging/debs/Debian/debian/control @@ -2,7 +2,7 @@ Source: rabbitmq-server Section: net Priority: extra Maintainer: RabbitMQ Team <packaging@rabbitmq.com> -Uploader: Emile Joubert <emile@rabbitmq.com> +Uploaders: Emile Joubert <emile@rabbitmq.com> DM-Upload-Allowed: yes Build-Depends: cdbs, debhelper (>= 5), erlang-dev, python-simplejson, xmlto, xsltproc, erlang-nox (>= 1:12.b.3), erlang-src (>= 1:12.b.3), unzip, zip Standards-Version: 3.8.0 diff --git a/packaging/debs/Debian/debian/rabbitmq-server.init b/packaging/debs/Debian/debian/rabbitmq-server.init index f514b9744b..c135207875 100644 --- a/packaging/debs/Debian/debian/rabbitmq-server.init +++ b/packaging/debs/Debian/debian/rabbitmq-server.init @@ -137,13 +137,18 @@ restart_end() { start_stop_end() { case "$RETVAL" in 0) - log_end_msg 0;; + [ -x /sbin/initctl ] && /sbin/initctl emit --no-wait "${NAME}-${1}" + log_end_msg 0 + ;; 3) log_warning_msg "${DESC} already ${1}" - log_end_msg 0;; + log_end_msg 0 + RETVAL=0 + ;; *) log_warning_msg "FAILED - check ${INIT_LOG_DIR}/startup_\{log, _err\}" - log_end_msg 1;; + log_end_msg 1 + ;; esac } @@ -151,7 +156,7 @@ case "$1" in start) log_daemon_msg "Starting ${DESC}" $NAME start_rabbitmq - start_stop_end "started" + start_stop_end "running" ;; stop) log_daemon_msg "Stopping ${DESC}" $NAME @@ -162,7 +167,7 @@ case "$1" in status_rabbitmq ;; rotate-logs) - log_action_begin_msg "Rotating log files for ${DESC} ${NAME}" + log_action_begin_msg "Rotating log files for ${DESC}: ${NAME}" rotate_logs_rabbitmq log_action_end_msg $RETVAL ;; |