Merge branch '0.8.x' into stats

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

diff --git a/scripts/jabberqueuehandler.php b/scripts/jabberqueuehandler.php
index 8e33cfaf0d7529448570524eb7dd9bc9799cd1c4..8b6e974c0aa7af3a87cca507ccfbf10f4d6b1920 100755 (executable)
--- a/scripts/jabberqueuehandler.php
+++ b/scripts/jabberqueuehandler.php
@@ -33,15 +33,18 @@ require_once(INSTALLDIR . '/lib/xmppqueuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class JabberQueueHandler extends XmppQueueHandler {
+class JabberQueueHandler extends XmppQueueHandler
+{
 
-    var $conn = NULL;
+    var $conn = null;
 
-    function transport() {
+    function transport()
+    {
         return 'jabber';
     }
 
-    function handle_notice($notice) {
+    function handle_notice($notice)
+    {
         try {
             return jabber_broadcast_notice($notice);
         } catch (XMPPHP_Exception $e) {
@@ -51,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);
@@ -60,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();