Merge branch 'master' of github.com:chrisboulton/php-resque

This commit is contained in:
Chris Boulton 2012-03-05 19:41:47 +11:00
commit 6651f957f1

View File

@ -95,7 +95,7 @@ class Resque_Worker
*/
public static function find($workerId)
{
if(!self::exists($workerId)) {
if(!self::exists($workerId) || false === strpos($workerId, ":")) {
return false;
}
@ -447,6 +447,7 @@ class Resque_Worker
$workerPids = $this->workerPids();
$workers = self::all();
foreach($workers as $worker) {
if (is_object($worker)) {
list($host, $pid, $queues) = explode(':', (string)$worker, 3);
if($host != $this->hostname || in_array($pid, $workerPids) || $pid == getmypid()) {
continue;
@ -455,6 +456,7 @@ class Resque_Worker
$worker->unregisterWorker();
}
}
}
/**
* Return an array of process IDs for all of the Resque workers currently