mirror of
https://github.com/idanoo/php-resque
synced 2025-07-01 05:32:20 +00:00
return false if the fork function is unavailable
This commit is contained in:
parent
08de86a41e
commit
4dbdda6aa2
1 changed files with 5 additions and 6 deletions
|
@ -72,12 +72,12 @@ class Resque
|
||||||
*
|
*
|
||||||
* Will close connection to Redis before forking.
|
* Will close connection to Redis before forking.
|
||||||
*
|
*
|
||||||
* @return int Return vars as per pcntl_fork()
|
* @return int Return vars as per pcntl_fork(). False if pcntl_fork is unavailable
|
||||||
*/
|
*/
|
||||||
public static function fork()
|
public static function fork()
|
||||||
{
|
{
|
||||||
if(!function_exists('pcntl_fork')) {
|
if(!function_exists('pcntl_fork')) {
|
||||||
return -1;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close the connection to Redis before forking.
|
// Close the connection to Redis before forking.
|
||||||
|
@ -281,12 +281,12 @@ class Resque
|
||||||
$originalQueue = 'queue:'. $queue;
|
$originalQueue = 'queue:'. $queue;
|
||||||
$tempQueue = $originalQueue. ':temp:'. time();
|
$tempQueue = $originalQueue. ':temp:'. time();
|
||||||
$requeueQueue = $tempQueue. ':requeue';
|
$requeueQueue = $tempQueue. ':requeue';
|
||||||
|
|
||||||
// move each item from original queue to temp queue and process it
|
// move each item from original queue to temp queue and process it
|
||||||
$finished = false;
|
$finished = false;
|
||||||
while (!$finished) {
|
while (!$finished) {
|
||||||
$string = self::redis()->rpoplpush($originalQueue, self::redis()->getPrefix() . $tempQueue);
|
$string = self::redis()->rpoplpush($originalQueue, self::redis()->getPrefix() . $tempQueue);
|
||||||
|
|
||||||
if (!empty($string)) {
|
if (!empty($string)) {
|
||||||
if(self::matchItem($string, $items)) {
|
if(self::matchItem($string, $items)) {
|
||||||
self::redis()->rpop($tempQueue);
|
self::redis()->rpop($tempQueue);
|
||||||
|
@ -311,7 +311,7 @@ class Resque
|
||||||
// remove temp queue and requeue queue
|
// remove temp queue and requeue queue
|
||||||
self::redis()->del($requeueQueue);
|
self::redis()->del($requeueQueue);
|
||||||
self::redis()->del($tempQueue);
|
self::redis()->del($tempQueue);
|
||||||
|
|
||||||
return $counter;
|
return $counter;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -377,4 +377,3 @@ class Resque
|
||||||
return md5(uniqid('', true));
|
return md5(uniqid('', true));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue