[DRE-commits] [SCM] unicorn.git branch, master, updated. upstream/4.2.1-19-g4e773b8

Hleb Valoshka 375GNU at Gmail.COM
Sun Apr 22 18:45:00 UTC 2012


The following commit has been merged in the master branch:
commit 254a2c0ebebe7a32a0f4e0dd44161c2f9730112e
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Sun Apr 22 21:41:58 2012 +0300

    Fix init.d script
    
      * fix "unbound variable blah-blah"
      * output status for "restart" operation

diff --git a/debian/unicorn.init b/debian/unicorn.init
index 00207bb..489ca68 100644
--- a/debian/unicorn.init
+++ b/debian/unicorn.init
@@ -25,7 +25,7 @@ TIMEOUT=${TIMEOUT-60}
 PID=${PID-/run/unicorn.pid}
 
 run_by_init() {
-    ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ]
+    ([ "${previous-}" ] && [ "${runlevel-}" ]) || [ "${runlevel-}" = S ]
 }
 
 exit_with_message() {
@@ -81,7 +81,11 @@ case "$1" in
         log_daemon_msg "Restarting $DESC" $NAME || true
         start-stop-daemon --stop --quiet --oknodo --pidfile $PID
         sleep 1
-        start-stop-daemon --start --quiet --oknodo --pidfile $PID --exec $DAEMON -- $UNICORN_OPTS
+        if start-stop-daemon --start --quiet --oknodo --pidfile $PID --exec $DAEMON -- $UNICORN_OPTS; then
+          log_end_msg 0 || true
+        else
+          log_end_msg 1 || true
+        fi
         ;;
   reload)
         log_daemon_msg "Reloading $DESC" $NAME || true

-- 
unicorn.git



More information about the Pkg-ruby-extras-commits mailing list