diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-27 14:52:35 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-27 14:52:35 -0400 |
commit | b3bb8943f592de9f6936f35be49a88c641bf6da1 (patch) | |
tree | befbe8ff6d3c7d1268ecce3696bee5caaa799db7 /scripts/jabberqueuehandler.php | |
parent | 698228acb9a6262f2fb4e0c82118249aa94cc0f8 (diff) | |
parent | f59ab5dc40862b141ee5463fd4d24b0d213a96f2 (diff) |
Merge branch '0.7.x' into utf8
Diffstat (limited to 'scripts/jabberqueuehandler.php')
-rwxr-xr-x | scripts/jabberqueuehandler.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/jabberqueuehandler.php b/scripts/jabberqueuehandler.php index 924fc4545..8b6e974c0 100755 --- a/scripts/jabberqueuehandler.php +++ b/scripts/jabberqueuehandler.php @@ -54,6 +54,13 @@ class JabberQueueHandler extends XmppQueueHandler } } +// Abort immediately if xmpp is not enabled, otherwise the daemon chews up +// lots of CPU trying to connect to unconfigured servers +if (common_config('xmpp','enabled')==false) { + print "Aborting daemon - xmpp is disabled\n"; + exit(); +} + ini_set("max_execution_time", "0"); ini_set("max_input_time", "0"); set_time_limit(0); @@ -63,4 +70,4 @@ $resource = ($argc > 1) ? $argv[1] : (common_config('xmpp','resource') . '-queue $handler = new JabberQueueHandler($resource); -$handler->runOnce();
\ No newline at end of file +$handler->runOnce(); |