GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sarven Capadisli 2009-07-09 17:02:27 +00:00
commit 228b2001d8
1 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
lib/stompqueuemanager.php
View File

@ -108,50 +108,25 @@ class StompQueueManager
$handsocks = $handler->getSockets(); $handsocks = $handler->getSockets();
$this->_log(LOG_DEBUG, "Got ".count($handsocks)." sockets from handler.");
$this->_log(LOG_DEBUG, print_r($handsocks, true));
$socks = array_merge(array($stompsock), $handsocks); $socks = array_merge(array($stompsock), $handsocks);
$read = $socks; $read = $socks;
$write = array(); $write = array();
$except = array(); $except = array();
$this->_log(LOG_DEBUG, "Starting select");
$ready = stream_select($read, $write, $except, $handler->timeout(), 0); $ready = stream_select($read, $write, $except, $handler->timeout(), 0);
$this->_log(LOG_DEBUG, "Finished select with value '$ready'");
if (!$ready || $read[0] !== $stompsock) { if ($ready === false) {
$handler->idle(QUEUE_HANDLER_MISS_IDLE); $this->_log(LOG_ERR, "Error selecting on sockets");
} else { } else if ($ready > 0) {
$frame = $this->con->readFrame(); if (in_array($stompsock, $read)) {
$this->_handleNotice($queue, $handler);
if (!empty($frame)) { }
$notice = Notice::staticGet('id', $frame->body); foreach ($handsocks as $sock) {
if (in_array($sock, $read)) {
if (empty($notice)) { $handler->idle(QUEUE_HANDLER_HIT_IDLE);
$this->_log(LOG_WARNING, 'Got ID '. $frame->body .' for non-existent notice in queue '. $queue); break;
$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 {
$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);
} }
unset($frame);
$handler->idle(QUEUE_HANDLER_HIT_IDLE);
} else {
$handler->idle(QUEUE_HANDLER_MISS_IDLE);
} }
} }
} }
@ -159,6 +134,34 @@ class StompQueueManager
$this->con->unsubscribe($this->_queueName($queue)); $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 {
$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);
}
unset($frame);
}
}
function _queueName($queue) function _queueName($queue)
{ {
return common_config('queue', 'queue_basename') . $queue; return common_config('queue', 'queue_basename') . $queue;