This commit is contained in:
2021-03-02 13:36:33 +08:00
parent 26a4b8190a
commit f036bd19af
2 changed files with 11 additions and 11 deletions
+6 -6
View File
@@ -56,9 +56,9 @@ trait Action
return; return;
} }
$content = file_get_contents($pid_file); $content = file_get_contents($pid_file);
$output = Coroutine\System::exec("ps -ef $content | grep $content"); exec("ps -ef $content | grep $content", $output);
if (!empty($output)) { if (!empty($output)) {
Coroutine\System::exec("kill -15 $content"); exec("kill -15 $content");
} }
$this->close($server); $this->close($server);
} }
@@ -108,7 +108,7 @@ trait Action
} }
foreach ($files as $file) { foreach ($files as $file) {
$content = file_get_contents($file->getRealPath()); $content = file_get_contents($file->getRealPath());
$output = Coroutine\System::exec("ps -ax | awk '{ print $1 }' | grep -e '^{$content}$'"); exec("ps -ax | awk '{ print $1 }' | grep -e '^{$content}$'", $output);
if (count($output) > 0) { if (count($output) > 0) {
$this->closeByPid($content); $this->closeByPid($content);
} else { } else {
@@ -138,9 +138,9 @@ trait Action
return false; return false;
} }
if (Snowflake::isLinux()) { if (Snowflake::isLinux()) {
$output = Coroutine\System::exec('netstat -tunlp | grep ' . $port); exec('netstat -tunlp | grep ' . $port, $output);
} else { } else {
$output = Coroutine\System::exec('lsof -i :' . $port . ' | grep -i "LISTEN"'); exec('lsof -i :' . $port . ' | grep -i "LISTEN"', $output);
} }
if (empty($output)) { if (empty($output)) {
return false; return false;
@@ -154,7 +154,7 @@ trait Action
*/ */
private function closeByPid($pid) private function closeByPid($pid)
{ {
Coroutine\System::exec("ps -ef | grep $pid | grep -v grep | grep -v kill exec("ps -ef | grep $pid | grep -v grep | grep -v kill
if [ $? -eq 0 ];then if [ $? -eq 0 ];then
kill -9 `ps -ef | grep $pid | grep -v grep | grep -v kill | awk '{print $2}'` kill -9 `ps -ef | grep $pid | grep -v grep | grep -v kill | awk '{print $2}'`
else else
+5 -5
View File
@@ -104,8 +104,6 @@ class Server extends HttpService
*/ */
public function initCore(array $configs): Packet|Websocket|Receive|Http|null public function initCore(array $configs): Packet|Websocket|Receive|Http|null
{ {
$this->enableCoroutine((bool)Config::get('settings.enable_coroutine'));
$this->orders($configs); $this->orders($configs);
$this->onProcessListener(); $this->onProcessListener();
return $this->getServer(); return $this->getServer();
@@ -145,6 +143,9 @@ class Server extends HttpService
if (!$baseServer) { if (!$baseServer) {
return 'ok'; return 'ok';
} }
$this->enableCoroutine();
return $baseServer->start(); return $baseServer->start();
} }
@@ -180,9 +181,9 @@ class Server extends HttpService
} }
foreach ($port as $value) { foreach ($port as $value) {
if (Snowflake::isLinux()) { if (Snowflake::isLinux()) {
$output = Coroutine\System::exec('netstat -tunlp | grep ' . $value['port']); exec('netstat -tunlp | grep ' . $value['port'], $output);
} else { } else {
$output = Coroutine\System::exec('lsof -i :' . $value['port'] . ' | grep -i "LISTEN"'); exec('lsof -i :' . $value['port'] . ' | grep -i "LISTEN"', $output);
} }
if (!empty($output)) { if (!empty($output)) {
return true; return true;
@@ -204,7 +205,6 @@ class Server extends HttpService
} }
/** /**
* @param bool $isEnable * @param bool $isEnable
*/ */