diff options
author | Evan Prodromou <evan@status.net> | 2010-01-27 22:05:32 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-27 22:05:32 -0500 |
commit | 5e1a9ad04d4e10ee44881a26ea72c9a80f748188 (patch) | |
tree | 78b7f4287d00a2ff32cf6adf82c6289a5d3b6b95 /scripts/queuedaemon.php | |
parent | 817f01c3b18ec626701de2a1402562eeb87eee6d (diff) | |
parent | ee4ea3f3e1eb64df2dd3ba677f5201f8787482a8 (diff) |
Merge branch 'testing'
Conflicts:
theme/base/css/display.css
Diffstat (limited to 'scripts/queuedaemon.php')
-rwxr-xr-x | scripts/queuedaemon.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php index a9cfda6d7..c2e2351c3 100755 --- a/scripts/queuedaemon.php +++ b/scripts/queuedaemon.php @@ -21,7 +21,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); $shortoptions = 'fi:at:'; -$longoptions = array('id=', 'foreground', 'all', 'threads=', 'skip-xmpp', 'xmpp-only'); +$longoptions = array('id=', 'foreground', 'all', 'threads='); /** * Attempts to get a count of the processors available on the current system @@ -115,7 +115,7 @@ class QueueDaemon extends SpawningDaemon $this->log(LOG_INFO, 'terminating normally'); - return true; + return $master->respawn ? self::EXIT_RESTART : self::EXIT_SHUTDOWN; } } @@ -163,13 +163,6 @@ if (!$threads) { $daemonize = !(have_option('f') || have_option('--foreground')); $all = have_option('a') || have_option('--all'); -if (have_option('--skip-xmpp')) { - define('XMPP_EMERGENCY_FLAG', true); -} -if (have_option('--xmpp-only')) { - define('XMPP_ONLY_FLAG', true); -} - $daemon = new QueueDaemon($id, $daemonize, $threads, $all); $daemon->runOnce(); |