Merge pull request chrisboulton#299 from chrisboulton/fork-return

Return false if the fork function is unavailable

Author: chrisboulton

bin/resque

@@ -96,7 +96,7 @@ if(!empty($PREFIX)) {
 if($count > 1) {
     for($i = 0; $i < $count; ++$i) {
         $pid = Resque::fork();
-        if($pid == -1) {
+        if($pid === false || pid === -1) {
             $logger->log(Psr\Log\LogLevel::EMERGENCY, 'Could not fork worker {count}', array('count' => $i));
             die();
         }

lib/Resque.php

@@ -72,12 +72,12 @@ public static function redis()
 	 *
 	 * 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()
 	{
 		if(!function_exists('pcntl_fork')) {
-			return -1;
+			return false;
 		}
 
 		// Close the connection to Redis before forking.
@@ -281,12 +281,12 @@ private static function removeItems($queue, $items = Array())
 		$originalQueue = 'queue:'. $queue;
 		$tempQueue = $originalQueue. ':temp:'. time();
 		$requeueQueue = $tempQueue. ':requeue';
-		
+
 		// move each item from original queue to temp queue and process it
 		$finished = false;
 		while (!$finished) {
 			$string = self::redis()->rpoplpush($originalQueue, self::redis()->getPrefix() . $tempQueue);
-	
+
 			if (!empty($string)) {
 				if(self::matchItem($string, $items)) {
 					self::redis()->rpop($tempQueue);
@@ -311,7 +311,7 @@ private static function removeItems($queue, $items = Array())
 		// remove temp queue and requeue queue
 		self::redis()->del($requeueQueue);
 		self::redis()->del($tempQueue);
-		
+
 		return $counter;
 	}
 
@@ -377,4 +377,3 @@ public static function generateJobId()
 		return md5(uniqid('', true));
 	}
 }
-