Merge branch '0.9.x' into 1.0.x

Conflicts: lib/queuemanager.php
2010-01-27 22:07:04 -05:00
parent e9995b0f6a 9589985e29
commit 914bc9f9c5
95 changed files with 13147 additions and 9157 deletions
--- a/scripts/imdaemon.php
+++ b/scripts/imdaemon.php
@@ -54,7 +54,7 @@ class ImDaemon extends SpawningDaemon

        common_log(LOG_INFO, 'terminating normally');

-        return true;
+        return $master->respawn ? self::EXIT_RESTART : self::EXIT_SHUTDOWN;
    }

 }