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

on exceptions, stomp logs the error and reenqueues

Browse Source
This commit is contained in:
Evan Prodromou 2010-01-30 13:15:17 -05:00
parent def5d56ce1
commit 4ae31f3476
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/stompqueuemanager.php
View File

@ -31,7 +31,6 @@
require_once 'Stomp.php'; require_once 'Stomp.php';
require_once 'Stomp/Exception.php'; require_once 'Stomp/Exception.php';
class StompQueueManager extends QueueManager class StompQueueManager extends QueueManager
{ {
protected $servers; protected $servers;
@ -41,7 +40,7 @@ class StompQueueManager extends QueueManager
protected $control; protected $control;
protected $useTransactions = true; protected $useTransactions = true;
protected $sites = array(); protected $sites = array();
protected $subscriptions = array(); protected $subscriptions = array();
@ -182,7 +181,7 @@ class StompQueueManager extends QueueManager
$this->_connect(); $this->_connect();
return $this->_doEnqueue($object, $queue, $this->defaultIdx); return $this->_doEnqueue($object, $queue, $this->defaultIdx);
} }
/** /**
* Saves a notice object reference into the queue item table * Saves a notice object reference into the queue item table
* on the given connection. * on the given connection.
@ -354,7 +353,7 @@ class StompQueueManager extends QueueManager
} }
return true; return true;
} }
/** /**
* Subscribe to all the queues we're going to need to handle... * Subscribe to all the queues we're going to need to handle...
* *
@ -459,7 +458,7 @@ class StompQueueManager extends QueueManager
if ($con) { if ($con) {
$this->cons[$idx] = $con; $this->cons[$idx] = $con;
$this->disconnect[$idx] = null; $this->disconnect[$idx] = null;
// now we have to listen to everything... // now we have to listen to everything...
// @fixme refactor this nicer. :P // @fixme refactor this nicer. :P
$host = $con->getServer(); $host = $con->getServer();
@ -587,7 +586,15 @@ class StompQueueManager extends QueueManager
return false; return false;
} }
$ok = $handler->handle($item); // If there's an exception when handling,
// log the error and let it get requeued.
try {
$ok = $handler->handle($item);
} catch (Exception $e) {
$this->_log(LOG_ERR, "Exception on queue $queue: " . $e->getMessage());
$ok = false;
}
if (!$ok) { if (!$ok) {
$this->_log(LOG_WARNING, "Failed handling $info"); $this->_log(LOG_WARNING, "Failed handling $info");
@ -646,7 +653,7 @@ class StompQueueManager extends QueueManager
$this->begin($idx); $this->begin($idx);
return $shutdown; return $shutdown;
} }
/** /**
* Set us up with queue subscriptions for a new site added at runtime, * Set us up with queue subscriptions for a new site added at runtime,
* triggered by a broadcast to the 'statusnet-control' topic. * triggered by a broadcast to the 'statusnet-control' topic.