as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-03-02 12:08:21 +08:00
parent 56d4d5dcb7
commit 53b8262588
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Action.php
+7 -6
View File
@@ -12,6 +12,7 @@ use Snowflake\Abstracts\Input;
use Snowflake\Exception\ComponentException; use Snowflake\Exception\ComponentException;
use Snowflake\Exception\ConfigException; use Snowflake\Exception\ConfigException;
use Snowflake\Snowflake; use Snowflake\Snowflake;
use Swoole\Coroutine;
use Swoole\WebSocket\Server; use Swoole\WebSocket\Server;
/** /**
@@ -55,9 +56,9 @@ trait Action
return; return;
} }
$content = file_get_contents($pid_file); $content = file_get_contents($pid_file);
exec("ps -ef $content | grep $content", $output); Coroutine\System::exec("ps -ef $content | grep $content", $output);
if (!empty($output)) { if (!empty($output)) {
exec("kill -15 $content"); Coroutine\System::exec("kill -15 $content");
} }
$this->close($server); $this->close($server);
} }
@@ -107,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());
exec("ps -ax | awk '{ print $1 }' | grep -e '^{$content}$'", $output); Coroutine\System::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 {
@@ -137,9 +138,9 @@ trait Action
return false; return false;
} }
if (Snowflake::isLinux()) { if (Snowflake::isLinux()) {
exec('netstat -tunlp | grep ' . $port, $output); Coroutine\System::exec('netstat -tunlp | grep ' . $port, $output);
} else { } else {
exec('lsof -i :' . $port . ' | grep -i "LISTEN"', $output); Coroutine\System::exec('lsof -i :' . $port . ' | grep -i "LISTEN"', $output);
} }
if (empty($output)) { if (empty($output)) {
return false; return false;
@@ -153,7 +154,7 @@ trait Action
*/ */
private function closeByPid($pid) private function closeByPid($pid)
{ {
exec("ps -ef | grep $pid | grep -v grep | grep -v kill Coroutine\System::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
HttpServer/Server.php
+2 -6
View File
@@ -3,7 +3,6 @@
namespace HttpServer; namespace HttpServer;
use Annotation\IAnnotation;
use HttpServer\Abstracts\HttpService; use HttpServer\Abstracts\HttpService;
use HttpServer\Events\OnClose; use HttpServer\Events\OnClose;
use HttpServer\Events\OnConnect; use HttpServer\Events\OnConnect;
@@ -23,12 +22,9 @@ use Snowflake\Exception\ComponentException;
use Snowflake\Exception\ConfigException; use Snowflake\Exception\ConfigException;
use Snowflake\Exception\NotFindClassException; use Snowflake\Exception\NotFindClassException;
use Snowflake\Process\Biomonitoring; use Snowflake\Process\Biomonitoring;
use Snowflake\Process\ServerInotify;
use Snowflake\Snowflake; use Snowflake\Snowflake;
use Swoole\Coroutine; use Swoole\Coroutine;
use Swoole\Process;
use Swoole\Runtime; use Swoole\Runtime;
use co;
defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid'); defined('PID_PATH') or define('PID_PATH', APP_PATH . 'storage/server.pid');
@@ -184,9 +180,9 @@ class Server extends HttpService
} }
foreach ($port as $value) { foreach ($port as $value) {
if (Snowflake::isLinux()) { if (Snowflake::isLinux()) {
exec('netstat -tunlp | grep ' . $value['port'], $output); Coroutine\System::exec('netstat -tunlp | grep ' . $value['port'], $output);
} else { } else {
exec('lsof -i :' . $value['port'] . ' | grep -i "LISTEN"', $output); Coroutine\System::exec('lsof -i :' . $value['port'] . ' | grep -i "LISTEN"', $output);
} }
if (!empty($output)) { if (!empty($output)) {
return true; return true;