don't clear old claims

darcs-hash:20080830070135-84dde-dc0cfc8e23c31c33617aa167f7c97d443b10539d.gz
This commit is contained in:
Evan Prodromou 2008-08-30 03:01:35 -04:00
parent ac85a4b0fa
commit 136f9a4016

View File

@ -53,7 +53,6 @@ class XmppConfirmHandler {
function handle_queue() { function handle_queue() {
$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) {
@ -82,9 +81,8 @@ class XmppConfirmHandler {
continue; continue;
} }
} }
$cnt++;
} else { } else {
$this->clear_old_confirm_claims(); # $this->clear_old_confirm_claims();
sleep(10); sleep(10);
} }
} while (true); } while (true);
@ -102,7 +100,7 @@ class XmppConfirmHandler {
$this->log(LOG_INFO, 'Claiming confirmation for ' . $confirm->address); $this->log(LOG_INFO, 'Claiming confirmation for ' . $confirm->address);
# working around some weird DB_DataObject behaviour # working around some weird DB_DataObject behaviour
$confirm->whereAdd(''); # clears where stuff $confirm->whereAdd(''); # clears where stuff
$original = clone($confirm); $original = clone($confirm);
$confirm->claimed = common_sql_now(); $confirm->claimed = common_sql_now();
$result = $confirm->update($original); $result = $confirm->update($original);
if ($result) { if ($result) {
@ -118,7 +116,7 @@ class XmppConfirmHandler {
function clear_old_confirm_claims() { function clear_old_confirm_claims() {
$confirm = new Confirm(); $confirm = new Confirm();
$confirm->claimed = NULL; $confirm->claimed = NULL;
$confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT); $confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
$confirm->update(DB_DATAOBJECT_WHEREADD_ONLY); $confirm->update(DB_DATAOBJECT_WHEREADD_ONLY);
} }