Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / scripts / imdaemon.php

diff --git a/scripts/imdaemon.php b/scripts/imdaemon.php
index c37a26b7c05cb821390f6fa874d5ee8a226cc1cd..ffb5ecf0d945fd98b3613bd920928b14836937b0 100755 (executable)
--- 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;
     }
 
 }