* IRC background connection manager for IRC-using queue handlers,
* allowing them to send outgoing messages on the right connection.
*
- * Input is handled during socket select loop, keepalive pings during idle.
- * Any incoming messages will be handled.
+ * Input is handled during socket select loop, Any incoming messages will be handled.
*
* In a multi-site queuedaemon.php run, one connection will be instantiated
* for each site being handled by the current process that has IRC enabled.
*/
class IrcManager extends ImManager {
- public $conn = null;
- public $regchecks = array();
- public $regchecksLookup = array();
+ protected $conn = null;
+ protected $lastPing = null;
+
+ protected $regChecks = array();
+ protected $regChecksLookup = array();
/**
* Initialize connection to server.
}
}
+ /**
+ * Idle processing for io manager's execution loop.
+ * Send keepalive pings to server.
+ *
+ * @return void
+ */
+ public function idle() {
+ if (empty($this->lastPing) || time() - $this->lastPing > 120) {
+ $this->sendPing();
+ }
+ }
+
/**
* Process IRC events that have come in over the wire.
*
- * @param resource $socket
+ * @param resource $socket Socket to handle input on
* @return void
*/
public function handleInput($socket) {
common_log(LOG_DEBUG, 'Servicing the IRC queue.');
$this->stats('irc_process');
- $this->conn->receive();
+
+ try {
+ $this->conn->handleEvents();
+ } catch (Phergie_Driver_Exception $e) {
+ $this->conn->reconnect();
+ }
}
/**
'connections' => array(
array(
'host' => $this->plugin->host,
- 'port' => $port,
+ 'port' => $this->plugin->port,
'username' => $this->plugin->username,
'realname' => $this->plugin->realname,
'nick' => $this->plugin->nick,
'driver' => 'statusnet',
- 'processor' => 'statusnet',
+ 'processor' => 'async',
+ 'processor.options' => array('sec' => 0, 'usec' => 0),
'plugins' => array(
'Pong',
'ui.enabled' => true,
'nickserv.password' => $this->plugin->nickservpassword,
+ 'nickserv.identify_message' => $this->plugin->nickservidentifyregexp,
+
'autojoin.channels' => $this->plugin->channels,
+
'statusnet.messagecallback' => array($this, 'handle_irc_message'),
- 'statusnet.regcallback' => array($this, 'handle_reg_response')
+ 'statusnet.regcallback' => array($this, 'handle_reg_response'),
+ 'statusnet.unregregexp' => $this->plugin->unregregexp,
+ 'statusnet.regregexp' => $this->plugin->regregexp
)
);
$this->conn->setConfig($config);
+ $this->lastPing = time();
$this->conn->connect();
}
return $this->conn;
/**
* Called via a callback when a message is received
- *
* Passes it back to the queuing system
*
* @param array $data Data
*/
public function handle_reg_response($data) {
// Retrieve data
- $nickdata = $this->regchecks[$data['nick']];
+ $screenname = $data['screenname'];
+ $nickdata = $this->regChecks[$screenname];
+ $usernick = $nickdata['user']->nickname;
- if ($data['registered']) {
- // Send message
- $this->plugin->send_confirmation_code($nickdata['screenname'], $nickdata['code'], $nickdata['user'], true);
- } else {
- $this->plugin->send_message($nickdata['screenname'], _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
+ if (isset($this->regChecksLookup[$usernick])) {
+ if ($data['registered']) {
+ // Send message
+ $this->plugin->send_confirmation_code($screenname, $nickdata['code'], $nickdata['user'], true);
+ } else {
+ $this->plugin->send_message($screenname, _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
- $confirm = new Confirm_address();
+ $confirm = new Confirm_address();
- $confirm->user_id = $user->id;
- $confirm->address_type = $this->plugin->transport;
+ $confirm->user_id = $user->id;
+ $confirm->address_type = $this->plugin->transport;
- if ($confirm->find(true)) {
- $result = $confirm->delete();
+ if ($confirm->find(true)) {
+ $result = $confirm->delete();
- if (!$result) {
- common_log_db_error($confirm, 'DELETE', __FILE__);
- // TRANS: Server error thrown on database error canceling IM address confirmation.
- $this->serverError(_('Couldn\'t delete confirmation.'));
- return;
+ if (!$result) {
+ common_log_db_error($confirm, 'DELETE', __FILE__);
+ // TRANS: Server error thrown on database error canceling IM address confirmation.
+ $this->serverError(_('Couldn\'t delete confirmation.'));
+ return;
+ }
}
}
- }
- // Unset lookup value
- unset($this->regchecksLookup[$nickdata['screenname']]);
+ // Unset lookup value
+ unset($this->regChecksLookup[$usernick]);
- // Unset data
- unset($this->regchecks[$data['nick']]);
+ // Unset data
+ unset($this->regChecks[$screename]);
+ }
}
/**
* Send a message using the daemon
*
- * @param $data Message
+ * @param $data Message data
* @return boolean true on success
*/
public function send_raw_message($data) {
if (!$this->conn) {
return false;
}
+
if ($data['type'] != 'message') {
// Nick checking
- $screenname = $data['nickdata']['screenname'];
- if (isset($this->regchecksLookup[$user->nickname])) {
+ $nickdata = $data['nickdata'];
+ $usernick = $nickdata['user']->nickname;
+ $screenname = $nickdata['screenname'];
+ // Cancel any existing checks for this user
+ if (isset($this->regChecksLookup[$usernick])) {
+ unset($this->regChecks[$this->regChecksLookup[$usernick]]);
}
- $this->regchecks[$screenname] = $data['nickdata'];
- $this->regchecksLookup[$user->nickname] = $screenname;
+
+ $this->regChecks[$screenname] = $nickdata;
+ $this->regChecksLookup[$usernick] = $screenname;
}
try {
$this->conn->reconnect();
return false;
}
+
return true;
}
+
+ /**
+ * Sends a ping
+ *
+ * @return void
+ */
+ protected function sendPing() {
+ $this->lastPing = time();
+ $this->conn->send('PING', $this->lastPing);
+ }
}