Merge branch '0.9.x' into 1.0.x

This commit is contained in:
Craig Andrews 2010-01-22 18:03:48 -05:00
commit 767b77d6c2

View File

@ -294,26 +294,7 @@ class StompQueueManager extends QueueManager
StatusNet::init($site); StatusNet::init($site);
} }
if (is_numeric($frame->body)) { $item = $this->decode($frame->body);
$id = intval($frame->body);
$info = "notice $id posted at {$frame->headers['created']} in queue $queue";
$notice = Notice::staticGet('id', $id);
if (empty($notice)) {
$this->_log(LOG_WARNING, "Skipping missing $info");
$this->ack($frame);
$this->commit();
$this->begin();
$this->stats('badnotice', $queue);
return false;
}
$item = $notice;
} else {
// @fixme should we serialize, or json, or what here?
$info = "string posted at {$frame->headers['created']} in queue $queue";
$item = $frame->body;
}
$handler = $this->getHandler($queue); $handler = $this->getHandler($queue);
if (!$handler) { if (!$handler) {