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

don't do too many broadcasts or confirms before checking the message queue

Browse Source 
darcs-hash:20080827142336-84dde-2bec2149d86900fd0291f8c00f85aa756842bbe1.gz
This commit is contained in:
Evan Prodromou 2008-08-27 10:23:36 -04:00
parent 9bdc7f8ec7
commit f3dc863d8f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/xmppdaemon.php
View File

@ -53,6 +53,9 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
define('LACONICA', true); define('LACONICA', true);
define('CLAIM_TIMEOUT', 100000); define('CLAIM_TIMEOUT', 100000);
define('MAX_BROADCAST_COUNT', 20);
define('MAX_CONFIRM_COUNT', 20);
require_once(INSTALLDIR . '/lib/common.php'); require_once(INSTALLDIR . '/lib/common.php');
require_once(INSTALLDIR . '/lib/jabber.php'); require_once(INSTALLDIR . '/lib/jabber.php');
@ -101,7 +104,7 @@ class XMPPDaemon {
$this->conn->addEventHandler('session_start', 'handle_session_start', $this); $this->conn->addEventHandler('session_start', 'handle_session_start', $this);
while(!$this->conn->isDisconnected()) { while(!$this->conn->isDisconnected()) {
$this->conn->processTime(10); $this->conn->processTime(5);
$this->broadcast_queue(); $this->broadcast_queue();
$this->confirmation_queue(); $this->confirmation_queue();
} }
@ -339,6 +342,7 @@ class XMPPDaemon {
function broadcast_queue() { function broadcast_queue() {
$this->clear_old_claims(); $this->clear_old_claims();
$this->log(LOG_INFO, 'checking for queued notices'); $this->log(LOG_INFO, 'checking for queued notices');
$cnt = 0;
do { do {
$qi = $this->top_queue_item(); $qi = $this->top_queue_item();
if ($qi) { if ($qi) {
@ -362,8 +366,9 @@ class XMPPDaemon {
$this->log(LOG_WARNING, 'queue item for notice that does not exist'); $this->log(LOG_WARNING, 'queue item for notice that does not exist');
} }
$qi->delete(); $qi->delete();
$cnt++;
} }
} while ($qi); } while ($qi && $cnt < MAX_BROADCAST_COUNT);
} }
function clear_old_claims() { function clear_old_claims() {
@ -381,6 +386,7 @@ class XMPPDaemon {
function confirmation_queue() { function confirmation_queue() {
# $this->clear_old_confirm_claims(); # $this->clear_old_confirm_claims();
$this->log(LOG_INFO, 'checking for queued confirmations'); $this->log(LOG_INFO, 'checking for queued confirmations');
$cnt = 0;
do { do {
$confirm = $this->next_confirm(); $confirm = $this->next_confirm();
if ($confirm) { if ($confirm) {
@ -409,8 +415,9 @@ class XMPPDaemon {
continue; continue;
} }
} }
$cnt++;
} }
} while ($confirm); } while ($confirm && $cnt < MAX_CONFIRM_COUNT);
} }
function next_confirm() { function next_confirm() {