Skip to content

Commit 4dbdda6

Browse files
committed
return false if the fork function is unavailable
1 parent 08de86a commit 4dbdda6

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

lib/Resque.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ public static function redis()
7272
*
7373
* Will close connection to Redis before forking.
7474
*
75-
* @return int Return vars as per pcntl_fork()
75+
* @return int Return vars as per pcntl_fork(). False if pcntl_fork is unavailable
7676
*/
7777
public static function fork()
7878
{
7979
if(!function_exists('pcntl_fork')) {
80-
return -1;
80+
return false;
8181
}
8282

8383
// Close the connection to Redis before forking.
@@ -281,12 +281,12 @@ private static function removeItems($queue, $items = Array())
281281
$originalQueue = 'queue:'. $queue;
282282
$tempQueue = $originalQueue. ':temp:'. time();
283283
$requeueQueue = $tempQueue. ':requeue';
284-
284+
285285
// move each item from original queue to temp queue and process it
286286
$finished = false;
287287
while (!$finished) {
288288
$string = self::redis()->rpoplpush($originalQueue, self::redis()->getPrefix() . $tempQueue);
289-
289+
290290
if (!empty($string)) {
291291
if(self::matchItem($string, $items)) {
292292
self::redis()->rpop($tempQueue);
@@ -311,7 +311,7 @@ private static function removeItems($queue, $items = Array())
311311
// remove temp queue and requeue queue
312312
self::redis()->del($requeueQueue);
313313
self::redis()->del($tempQueue);
314-
314+
315315
return $counter;
316316
}
317317

@@ -377,4 +377,3 @@ public static function generateJobId()
377377
return md5(uniqid('', true));
378378
}
379379
}
380-

0 commit comments

Comments
 (0)