Merge pull request chrisboulton#314 from sapolang/master

chrisboulton · web-flow · commit cf187fae522d · 2016-11-03T14:56:00.000-07:00
bin/resque 99行pid变量缺少一个$
diff --git a/bin/resque b/bin/resque
@@ -96,7 +96,7 @@ if(!empty($PREFIX)) {
 if($count > 1) {
     for($i = 0; $i < $count; ++$i) {
         $pid = Resque::fork();
-        if($pid === false || pid === -1) {
+        if($pid === false || $pid === -1) {
             $logger->log(Psr\Log\LogLevel::EMERGENCY, 'Could not fork worker {count}', array('count' => $i));
             die();
         }
@@ -126,4 +126,4 @@ else {
     $logger->log(Psr\Log\LogLevel::NOTICE, 'Starting worker {worker}', array('worker' => $worker));
     $worker->work($interval, $BLOCKING);
 }
-?>
+?>

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ if(!empty($PREFIX)) {`
`96`	`96`	`if($count > 1) {`
`97`	`97`	`for($i = 0; $i < $count; ++$i) {`
`98`	`98`	`$pid = Resque::fork();`
`99`		`- if($pid === false \|\| pid === -1) {`
	`99`	`+ if($pid === false \|\| $pid === -1) {`
`100`	`100`	`$logger->log(Psr\Log\LogLevel::EMERGENCY, 'Could not fork worker {count}', array('count' => $i));`
`101`	`101`	`die();`
`102`	`102`	`}`
`@@ -126,4 +126,4 @@ else {`
`126`	`126`	`$logger->log(Psr\Log\LogLevel::NOTICE, 'Starting worker {worker}', array('worker' => $worker));`
`127`	`127`	`$worker->work($interval, $BLOCKING);`
`128`	`128`	`}`
`129`		`-?>`
	`129`	`+?>`