X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fstompqueuemanager.php;h=f059b42f0095f69f5db827bbf3f5698d128f87ba;hb=69ac99ff949ab0118ff25a62471980ad0ec7a52b;hp=b8731d5439c4d936bc9bc6687e6b1f1b2610e175;hpb=49c5c6f92bc1d06e6464eade81eead891d86f10d;p=quix0rs-gnu-social.git

diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index b8731d5439..f059b42f00 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Abstract class for queue managers
  *
@@ -20,16 +20,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  QueueManager
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 require_once 'Stomp.php';
 
+class LiberalStomp extends Stomp
+{
+    function getSocket()
+    {
+        return $this->_socket;
+    }
+}
+
 class StompQueueManager
 {
     var $server = null;
@@ -37,7 +45,6 @@ class StompQueueManager
     var $password = null;
     var $base = null;
     var $con = null;
-    var $frames = array();
 
     function __construct()
     {
@@ -49,10 +56,9 @@ class StompQueueManager
 
     function _connect()
     {
-        $this->_log(LOG_DEBUG, "Connecting to $this->server...");
         if (empty($this->con)) {
             $this->_log(LOG_INFO, "Connecting to '$this->server' as '$this->username'...");
-            $this->con = new Stomp($this->server);
+            $this->con = new LiberalStomp($this->server);
 
             if ($this->con->connect($this->username, $this->password)) {
                 $this->_log(LOG_INFO, "Connected.");
@@ -76,12 +82,12 @@ class StompQueueManager
                                    array ('created' => $notice->created));
 
         if (!$result) {
-            common_log(LOG_ERR, 'Error sending to '.$transport.' queue');
+            common_log(LOG_ERR, 'Error sending to '.$queue.' queue');
             return false;
         }
 
         common_log(LOG_DEBUG, 'complete remote queueing notice ID = '
-                   . $notice->id . ' for ' . $transport);
+                   . $notice->id . ' for ' . $queue);
     }
 
     function service($queue, $handler)
@@ -96,21 +102,59 @@ class StompQueueManager
 
         while (true) {
 
-            $frame = $this->con->readFrame();
+            // Wait for something on one of our sockets
+
+            $stompsock = $this->con->getSocket();
 
-            if ($frame) {
-                $notice = Notice::staticGet($frame->body);
+            $handsocks = $handler->getSockets();
 
+            $socks = array_merge(array($stompsock), $handsocks);
+
+            $read = $socks;
+            $write = array();
+            $except = array();
+
+            $ready = stream_select($read, $write, $except, $handler->timeout(), 0);
+
+            if ($ready === false) {
+                $this->_log(LOG_ERR, "Error selecting on sockets");
+            } else if ($ready > 0) {
+                if (in_array($stompsock, $read)) {
+                    $this->_handleNotice($queue, $handler);
+                }
+                $handler->idle(QUEUE_HANDLER_HIT_IDLE);
+            }
+        }
+
+        $this->con->unsubscribe($this->_queueName($queue));
+    }
+
+    function _handleNotice($queue, $handler)
+    {
+        $frame = $this->con->readFrame();
+
+        if (!empty($frame)) {
+            $notice = Notice::staticGet('id', $frame->body);
+
+            if (empty($notice)) {
+                $this->_log(LOG_WARNING, 'Got ID '. $frame->body .' for non-existent notice in queue '. $queue);
+                $this->con->ack($frame);
+            } else {
                 if ($handler->handle_notice($notice)) {
-                    $this->_log(LOG_INFO, 'Successfully handled notice '. $notice->id);
+                    $this->_log(LOG_INFO, 'Successfully handled notice '. $notice->id .' posted at ' . $frame->headers['created'] . ' in queue '. $queue);
+                    $this->con->ack($frame);
+                } else {
+                    $this->_log(LOG_WARNING, 'Failed handling notice '. $notice->id .' posted at ' . $frame->headers['created']  . ' in queue '. $queue);
+                    // FIXME we probably shouldn't have to do
+                    // this kind of queue management ourselves
                     $this->con->ack($frame);
+                    $this->enqueue($notice, $queue);
                 }
+                unset($notice);
             }
 
-            $handler->idle(0);
+            unset($frame);
         }
-
-        $this->con->unsubscribe($this->_queueName($queue));
     }
 
     function _queueName($queue)