many jabber queue management changes
Added a method to QueueManager to let subclasses do stuff when idle. Needed so that XMPP queue manager can service its message queue. Cleaned up jabber_broadcast_message quite a bit. Use custom joins instead of loop-and-query, should fix some problems with users who are getting messages even after turning off notification. Only build $msg and $entry once, and use the XMPPHP function for messages with a payload, rather than rolling our own. darcs-hash:20080829200352-84dde-427e4ca8c81d4222a36f78e7c580b611ff0bf765.gz
This commit is contained in:
@@ -57,7 +57,6 @@ class QueueHandler {
|
||||
|
||||
function handle_queue() {
|
||||
$this->log(LOG_INFO, 'checking for queued notices');
|
||||
$cnt = 0;
|
||||
$transport = $this->transport();
|
||||
do {
|
||||
$qi = Queue_item::top($transport);
|
||||
@@ -82,14 +81,23 @@ class QueueHandler {
|
||||
$this->log(LOG_WARNING, 'queue item for notice that does not exist');
|
||||
}
|
||||
$qi->delete();
|
||||
$cnt++;
|
||||
$this->idle();
|
||||
} else {
|
||||
$this->clear_old_claims();
|
||||
sleep(10);
|
||||
$start = microtime();
|
||||
$this->idle();
|
||||
$used = microtime() - $start;
|
||||
if ($used < 5000000) {
|
||||
usleep(5000000 - $used);
|
||||
}
|
||||
}
|
||||
} while (true);
|
||||
}
|
||||
|
||||
function idle() {
|
||||
return true;
|
||||
}
|
||||
|
||||
function clear_old_claims() {
|
||||
$qi = new Queue_item();
|
||||
$qi->transport = $this->transport();
|
||||
|
Reference in New Issue
Block a user