Merge pull request swooletw#304 from swooletw/develop

albertcht · web-flow · commit a7874424935e · 2019-07-05T11:20:21.000+08:00
fix pids in isRunning
diff --git a/src/Commands/HttpServerCommand.php b/src/Commands/HttpServerCommand.php
@@ -286,7 +286,8 @@ public function isRunning()
             return false;
         }
 
-        [$masterPid, $managerPid] = $pids;
+        $masterPid = $pids['masterPid'] ?? null;
+        $managerPid = $pids['managerPid'] ?? null;
 
         if ($managerPid) {
             // Swoole process mode

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,8 @@ public function isRunning()`
`286`	`286`	`return false;`
`287`	`287`	`}`
`288`	`288`
`289`		`- [$masterPid, $managerPid] = $pids;`
	`289`	`+ $masterPid = $pids['masterPid'] ?? null;`
	`290`	`+ $managerPid = $pids['managerPid'] ?? null;`
`290`	`291`
`291`	`292`	`if ($managerPid) {`
`292`	`293`	`// Swoole process mode`