idanoo/php-resque
1
0
Fork 0
mirror of https://github.com/idanoo/php-resque.git synced 2024-11-22 08:15:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24 from d11wtq/bugfix/broken-pipe

Browse Source 
Fix a bug where the worker would spin out of control if the redis socket is interrupted
This commit is contained in:
Chris Boulton 2011-09-23 22:38:23 -07:00
commit c0cdc3cf68
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Redisent/Redisent.php
View File

@ -49,6 +49,10 @@ class Redisent {
function __construct($host, $port = 6379) { function __construct($host, $port = 6379) {
$this->host = $host; $this->host = $host;
$this->port = $port; $this->port = $port;
$this->establishConnection();
}
function establishConnection() {
$this->__sock = fsockopen($this->host, $this->port, $errno, $errstr); $this->__sock = fsockopen($this->host, $this->port, $errno, $errstr);
if (!$this->__sock) { if (!$this->__sock) {
throw new Exception("{$errno} - {$errstr}"); throw new Exception("{$errno} - {$errstr}");

10
lib/Resque/Worker.php
View File

@ -358,6 +358,7 @@ class Resque_Worker
pcntl_signal(SIGUSR1, array($this, 'killChild')); pcntl_signal(SIGUSR1, array($this, 'killChild'));
pcntl_signal(SIGUSR2, array($this, 'pauseProcessing')); pcntl_signal(SIGUSR2, array($this, 'pauseProcessing'));
pcntl_signal(SIGCONT, array($this, 'unPauseProcessing')); pcntl_signal(SIGCONT, array($this, 'unPauseProcessing'));
pcntl_signal(SIGPIPE, array($this, 'reestablishRedisConnection'));
$this->log('Registered signals', self::LOG_VERBOSE); $this->log('Registered signals', self::LOG_VERBOSE);
} }
@ -380,6 +381,15 @@ class Resque_Worker
$this->paused = false; $this->paused = false;
} }
/**
* Signal handler for SIGPIPE, in the event the redis connection has gone away.
* Attempts to reconnect to redis, or raises an Exception.
*/
public function reestablishRedisConnection() {
$this->log('SIGPIPE received; attempting to reconnect');
Resque::redis()->establishConnection();
}
/** /**
* Schedule a worker for shutdown. Will finish processing the current job * Schedule a worker for shutdown. Will finish processing the current job
* and when the timeout interval is reached, the worker will shut down. * and when the timeout interval is reached, the worker will shut down.