Merge pull request #299 from chrisboulton/fork-return

Return false if the fork function is unavailable
This commit is contained in:
Chris Boulton 2016-10-11 13:10:59 -07:00 committed by GitHub
commit c928347ae7
2 changed files with 6 additions and 7 deletions

View File

@ -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();
}

View File

@ -72,12 +72,12 @@ class Resque
*
* 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.
@ -377,4 +377,3 @@ class Resque
return md5(uniqid('', true));
}
}