This commit is contained in:
2021-08-18 11:56:19 +08:00
parent f375eec0a0
commit 99e2f36794
9 changed files with 21 additions and 14 deletions
+1 -1
View File
@@ -92,7 +92,7 @@ class Request extends HttpService implements RequestInterface
*/
public function getConnectInfo(): array|null
{
$server = ServerManager::getContext()->getServer();
$server = di(ServerManager::class)->getServer();
return $server->getClientInfo($this->getClientId());
}
+2 -1
View File
@@ -82,13 +82,14 @@ class Response extends HttpService implements ResponseInterface
/**
* @return mixed
* @throws
*/
public function getClientInfo(): mixed
{
if (!empty($this->_clientInfo)) {
return $this->_clientInfo;
}
$server = ServerManager::getContext()->getServer();
$server = di(ServerManager::class)->getServer();
return $server->getClientInfo($this->clientId, $this->reactorId);
}
+7 -2
View File
@@ -36,7 +36,13 @@ class Server extends HttpService
];
private ServerManager $manager;
/**
* @Inject ServerManager
* @var null|ServerManager
*/
#[Inject(ServerManager::class)]
private ?ServerManager $manager = null;
private mixed $daemon = 0;
@@ -50,7 +56,6 @@ class Server extends HttpService
*/
public function init()
{
$this->manager = ServerManager::getContext();
}
+2 -2
View File
@@ -49,7 +49,7 @@ class Shutdown extends Component
return;
}
$server = ServerManager::getContext()->getServer();
$server = di(ServerManager::class)->getServer();
$master_pid = $server->setting['pid_file'] ?? PID_PATH;
if (file_exists($master_pid)) {
$this->close(file_get_contents($master_pid));
@@ -77,7 +77,7 @@ class Shutdown extends Component
*/
public function isRunning(): bool
{
$server = ServerManager::getContext()->getServer();
$server = di(ServerManager::class)->getServer();
$master_pid = $server->setting['pid_file'] ?? PID_PATH;
if (!file_exists($master_pid)) {