Merge branch '0.7.x' of git://gitorious.org/laconica/bAvatar-clone without the uninte...

[quix0rs-gnu-social.git] / scripts / xmppdaemon.php

diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 5711f715dfeffff4d8b123c80a78dca5b982541c..b79fa1b3ba0145101e167ddafea80fdd67ca3fc8 100755 (executable)
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -314,6 +314,13 @@ class XMPPDaemon extends Daemon
     }
 }
 
+// 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);