Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

[quix0rs-gnu-social.git] / lib / stompqueuemanager.php

diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index e7e1e00dd9743aa82ff4d444306ff39067442b16..46baeb5c73ef32ae4177d578207bffc305830821 100644 (file)
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -30,6 +30,14 @@
 
 require_once 'Stomp.php';
 
+class LiberalStomp extends Stomp
+{
+    function getSocket()
+    {
+        return $this->_socket;
+    }
+}
+
 class StompQueueManager
 {
     var $server = null;
@@ -50,7 +58,7 @@ class StompQueueManager
     {
         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.");
@@ -94,27 +102,59 @@ class StompQueueManager
 
         while (true) {
 
-            $frame = $this->con->readFrame();
+            // Wait for something on one of our sockets
+
+            $stompsock = $this->con->getSocket();
 
-            if (!empty($frame)) {
-                $notice = Notice::staticGet('id', $frame->body);
+            $handsocks = $handler->getSockets();
 
-                if (empty($notice)) {
-                    $this->_log(LOG_WARNING, 'Got ID '. $frame->body .' for non-existent notice');
+            $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 .' posted at ' . $frame->headers['created'] . ' in queue '. $queue);
                     $this->con->ack($frame);
-                } else if ($handler->handle_notice($notice)) {
-                    $this->_log(LOG_INFO, 'Successfully handled notice '. $notice->id .' posted at ' . $frame->headers['created']);
+                } 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);
-                    unset($notice);
+                    $this->enqueue($notice, $queue);
                 }
-
-                unset($frame);
+                unset($notice);
             }
 
-            $handler->idle(0);
+            unset($frame);
         }
-
-        $this->con->unsubscribe($this->_queueName($queue));
     }
 
     function _queueName($queue)