X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fxmppqueuehandler.php;h=f28fc9088c47b1449b91a0575f4656e43b3abf2e;hb=69ac99ff949ab0118ff25a62471980ad0ec7a52b;hp=0a73403f9350a03f5b379d1c7be1915feadada09;hpb=04ef1ba8eee7a9e2a565d7b4b747ef607665d562;p=quix0rs-gnu-social.git

diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php
index 0a73403f93..f28fc9088c 100644
--- a/lib/xmppqueuehandler.php
+++ b/lib/xmppqueuehandler.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,35 +17,53 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/queuehandler.php');
 
+define('PING_INTERVAL', 120);
+
 /**
- * Common superclass for all XMPP-using queue handlers. They all need to 
+ * Common superclass for all XMPP-using queue handlers. They all need to
  * service their message queues on idle, and forward any incoming messages
  * to the XMPP listener connection. So, we abstract out common code to a
  * superclass.
  */
 
-class XmppQueueHandler extends QueueHandler {
-    
+class XmppQueueHandler extends QueueHandler
+{
+    var $pingid = 0;
+    var $lastping = null;
+
     function start()
     {
         # Low priority; we don't want to receive messages
+
         $this->log(LOG_INFO, "INITIALIZE");
-        $this->conn = jabber_connect($this->_id);
-        if ($this->conn) {
-            $this->conn->addEventHandler('message', 'forward_message', $this);
-            $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
-            $this->conn->setReconnectTimeout(600);
-            jabber_send_presence("Send me a message to post a notice", 'available', null, 'available', -1);
+        $this->conn = jabber_connect($this->_id.$this->transport());
+
+        if (empty($this->conn)) {
+            $this->log(LOG_ERR, "Couldn't connect to server.");
+            return false;
         }
+
+        $this->conn->addEventHandler('message', 'forward_message', $this);
+        $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
+        $this->conn->setReconnectTimeout(600);
+        jabber_send_presence("Send me a message to post a notice", 'available', null, 'available', -1);
+
         return !is_null($this->conn);
     }
-    
+
+    function timeout()
+    {
+        return 10;
+    }
+
     function handle_reconnect(&$pl)
     {
+        $this->log(LOG_NOTICE, 'reconnected');
+
         $this->conn->processUntil('session_start');
         $this->conn->presence(null, 'available', null, 'available', -1);
     }
@@ -55,14 +73,36 @@ class XmppQueueHandler extends QueueHandler {
         # Process the queue for as long as needed
         try {
             if ($this->conn) {
+                $this->log(LOG_DEBUG, "Servicing the XMPP queue.");
                 $this->conn->processTime($timeout);
+                $now = time();
+                if (empty($this->lastping) || $now - $this->lastping > PING_INTERVAL) {
+                    $this->sendPing();
+                    $this->lastping = $now;
+                }
             }
         } catch (XMPPHP_Exception $e) {
             $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
             die($e->getMessage());
         }
     }
-    
+
+    function sendPing()
+    {
+        $jid = jabber_daemon_address().'/'.$this->_id.$this->transport();
+        $server = common_config('xmpp', 'server');
+
+        if (!isset($this->pingid)) {
+            $this->pingid = 0;
+        } else {
+            $this->pingid++;
+        }
+
+        $this->log(LOG_DEBUG, "Sending ping #{$this->pingid}");
+
+		$this->conn->send("<iq from='{$jid}' to='{$server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
+    }
+
     function forward_message(&$pl)
     {
         if ($pl['type'] != 'chat') {
@@ -91,7 +131,12 @@ class XmppQueueHandler extends QueueHandler {
         if (common_config('xmpp', 'listener')) {
             return common_config('xmpp', 'listener');
         } else {
-            return jabber_daemon_address() . '/' . common_config('xmpp','resource') . '-listener';
+            return jabber_daemon_address() . '/' . common_config('xmpp','resource') . 'daemon';
         }
     }
+
+    function getSockets()
+    {
+        return array($this->conn->getSocket());
+    }
 }