diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-25 22:47:23 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-25 22:47:23 -0400 |
commit | 76aa85fe5ef408cecf7c40c0c56d58ff9ac9fcbb (patch) | |
tree | f2bd52d08e421f934bc8466ab1ecb4facbbcc6a5 /scripts/publicqueuehandler.php | |
parent | b140bcdee4b1f4c8f2f34a89a9c5c51e7ecfe826 (diff) | |
parent | 68d90bcab04713d53cf3731d45729a617e68a2fa (diff) |
Merge branch '0.8.x' into stats
Conflicts:
README
Diffstat (limited to 'scripts/publicqueuehandler.php')
-rwxr-xr-x | scripts/publicqueuehandler.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php index 5075c12df..b0fa22d43 100755 --- a/scripts/publicqueuehandler.php +++ b/scripts/publicqueuehandler.php @@ -52,6 +52,13 @@ class PublicQueueHandler 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); |