require_once(INSTALLDIR . '/lib/common.php');
require_once(INSTALLDIR . '/lib/jabber.php');
-require_once(INSTALLDIR . '/lib/queuehandler.php');
+require_once(INSTALLDIR . '/lib/xmppqueuehandler.php');
set_error_handler('common_error_handler');
define('CLAIM_TIMEOUT', 1200);
-class XmppConfirmHandler {
+class XmppConfirmHandler extends XmppQueueHandler {
var $_id = 'confirm';
- function XmppConfirmHandler($id=NULL) {
- if ($id) {
- $this->_id = $id;
- }
- }
-
- function start() {
- # Low priority; we don't want to receive messages
- $this->conn = jabber_connect($this->_id, NULL, -1);
- return !is_null($this->conn);
+ function class_name() {
+ return 'XmppConfirmHandler';
}
- function handle_queue() {
+ function run() {
+ if (!$this->start()) {
+ return false;
+ }
$this->log(LOG_INFO, 'checking for queued confirmations');
do {
$confirm = $this->next_confirm();
continue;
} else {
$this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address);
- # Mark confirmation sent
- $original = clone($confirm);
- $confirm->sent = $confirm->claimed;
- $result = $confirm->update($original);
+ # Mark confirmation sent; need a dupe so we don't have the WHERE clause
+ $dupe = Confirm_address::staticGet('code', $confirm->code);
+ if (!$dupe) {
+ common_log(LOG_WARNING, 'Could not refetch confirm', __FILE__);
+ continue;
+ }
+ $orig = clone($dupe);
+ $dupe->sent = $dupe->claimed;
+ $result = $dupe->update($orig);
if (!$result) {
- $this->log(LOG_ERR, 'Cannot mark sent for ' . $confirm->address);
+ common_log_db_error($dupe, 'UPDATE', __FILE__);
# Just let the claim age out; hopefully things work then
continue;
}
+ $dupe->free();
+ unset($dupe);
}
+ $user->free();
+ unset($user);
+ $confirm->free();
+ unset($confirm);
+ $this->idle(0);
} else {
# $this->clear_old_confirm_claims();
- sleep(10);
+ $this->idle(10);
}
} while (true);
+ if (!$this->finish()) {
+ return false;
+ }
+ return true;
}
function next_confirm() {
$confirm->claimed = NULL;
$confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
$confirm->update(DB_DATAOBJECT_WHEREADD_ONLY);
- }
-
- function log($level, $msg) {
- common_log($level, 'XmppConfirmHandler ('. $this->_id .'): '.$msg);
+ $confirm->free();
+ unset($confirm);
}
}
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
mb_internal_encoding('UTF-8');
$resource = ($argc > 1) ? $argv[1] : (common_config('xmpp', 'resource').'-confirm');
$handler = new XmppConfirmHandler($resource);
-if ($handler->start()) {
- $handler->handle_queue();
-}
+$handler->runOnce();
-$handler->finish();