Merge branch 'master' of git@gitorious.org:statusnet/mainline

1 files changed, 8 insertions, 1 deletions

diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php
index 8ef364fe7..162f617e0 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=');
+$longoptions = array('id=', 'foreground', 'all', 'threads=', 'skip-xmpp', 'xmpp-only');
 
 /**
  * Attempts to get a count of the processors available on the current system
@@ -260,6 +260,13 @@ 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();