* 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.
* @return void
*/
public function idle() {
- // Call Phergie's doTick methods if necessary
- echo "BEGIN IDLE\n";
- $this->conn->handleEvents();
- echo "END IDLE\n";
+ 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->handleEvents();
+
+ try {
+ $this->conn->handleEvents();
+ } catch (Phergie_Driver_Exception $e) {
+ $this->conn->reconnect();
+ }
}
/**
);
$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
$screenname = $data['screenname'];
- $nickdata = $this->regchecks[$screenname];
+ $nickdata = $this->regChecks[$screenname];
$usernick = $nickdata['user']->nickname;
- if (isset($this->regchecksLookup[$usernick])) {
+ if (isset($this->regChecksLookup[$usernick])) {
if ($data['registered']) {
// Send message
$this->plugin->send_confirmation_code($screenname, $nickdata['code'], $nickdata['user'], true);
}
// Unset lookup value
- unset($this->regchecksLookup[$usernick]);
+ unset($this->regChecksLookup[$usernick]);
// Unset data
- unset($this->regchecks[$screename]);
+ 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) {
$screenname = $nickdata['screenname'];
// Cancel any existing checks for this user
- if (isset($this->regchecksLookup[$usernick])) {
- unset($this->regchecks[$this->regchecksLookup[$usernick]]);
+ if (isset($this->regChecksLookup[$usernick])) {
+ unset($this->regChecks[$this->regChecksLookup[$usernick]]);
}
- $this->regchecks[$screenname] = $nickdata;
- $this->regchecksLookup[$usernick] = $screenname;
+ $this->regChecks[$screenname] = $nickdata;
+ $this->regChecksLookup[$usernick] = $screenname;
}
- $args = $data['data']['args'];
- $lines = explode("\n", $args[1]);
try {
- foreach ($lines as $line) {
- $this->conn->send($data['data']['command'], array($args[0], $line));
- }
+ $this->conn->send($data['data']['command'], $data['data']['args']);
} catch (Phergie_Driver_Exception $e) {
$this->conn->reconnect();
return false;
return true;
}
+
+ /**
+ * Sends a ping
+ *
+ * @return void
+ */
+ protected function sendPing() {
+ $this->lastPing = time();
+ $this->conn->send('PING', $this->lastPing);
+ }
}