diff options
author | Brion Vibber <brion@pobox.com> | 2010-01-27 17:39:03 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-01-27 17:39:03 -0800 |
commit | 0794ecf372ffff2e0cc93509ae3462ca0cbbc99c (patch) | |
tree | 79695c758dc0e919b5cbcaaf1260125f3e97c4a2 /scripts/xmppdaemon.php | |
parent | 2e0297bb6ff0fd2d3a37d811bd3305ce5d6a77ee (diff) | |
parent | 07d50a012af70d9bd35a26f645d791ae7ba29986 (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline
Diffstat (limited to 'scripts/xmppdaemon.php')
-rwxr-xr-x | scripts/xmppdaemon.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php index fd7cf055b..46dd9b90c 100755 --- a/scripts/xmppdaemon.php +++ b/scripts/xmppdaemon.php @@ -56,7 +56,7 @@ class XMPPDaemon extends SpawningDaemon common_log(LOG_INFO, 'terminating normally'); - return true; + return $master->respawn ? self::EXIT_RESTART : self::EXIT_SHUTDOWN; } } |