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

改名

Browse Source
This commit is contained in:
向林
2021-12-23 18:22:26 +08:00
parent bffe375230
commit 2feda943af
6 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Handler/OnServer.php
+4
View File
@@ -5,6 +5,7 @@ namespace Server\Handler;
use Note\Inject; use Note\Inject;
use Kiri\Events\EventDispatch; use Kiri\Events\EventDispatch;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use ReflectionException;
use Server\Abstracts\Server; use Server\Abstracts\Server;
use Server\Events\OnBeforeShutdown; use Server\Events\OnBeforeShutdown;
use Server\Events\OnShutdown; use Server\Events\OnShutdown;
@@ -28,6 +29,7 @@ class OnServer extends Server
/** /**
* @param \Swoole\Server $server * @param \Swoole\Server $server
* @throws ConfigException * @throws ConfigException
* @throws ReflectionException
*/ */
public function onStart(\Swoole\Server $server) public function onStart(\Swoole\Server $server)
{ {
@@ -39,6 +41,7 @@ class OnServer extends Server
/** /**
* @param \Swoole\Server $server * @param \Swoole\Server $server
* @throws ReflectionException
*/ */
public function onBeforeShutdown(\Swoole\Server $server) public function onBeforeShutdown(\Swoole\Server $server)
{ {
@@ -48,6 +51,7 @@ class OnServer extends Server
/** /**
* @param \Swoole\Server $server * @param \Swoole\Server $server
* @throws ReflectionException
*/ */
public function onShutdown(\Swoole\Server $server) public function onShutdown(\Swoole\Server $server)
{ {
Handler/OnServerManager.php
+3 -1
View File
@@ -4,6 +4,7 @@ namespace Server\Handler;
use Note\Inject; use Note\Inject;
use Kiri\Events\EventDispatch; use Kiri\Events\EventDispatch;
use ReflectionException;
use Server\Abstracts\Server; use Server\Abstracts\Server;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use Server\Events\OnManagerStart; use Server\Events\OnManagerStart;
@@ -26,7 +27,7 @@ class OnServerManager extends Server
/** /**
* @param \Swoole\Server $server * @param \Swoole\Server $server
* @throws ConfigException * @throws ConfigException|ReflectionException
*/ */
public function onManagerStart(\Swoole\Server $server) public function onManagerStart(\Swoole\Server $server)
{ {
@@ -38,6 +39,7 @@ class OnServerManager extends Server
/** /**
* @param \Swoole\Server $server * @param \Swoole\Server $server
* @throws ReflectionException
*/ */
public function onManagerStop(\Swoole\Server $server) public function onManagerStop(\Swoole\Server $server)
{ {
Handler/OnServerReload.php
+2
View File
@@ -25,6 +25,7 @@ class OnServerReload
/** /**
* @param Server $server * @param Server $server
* @throws \ReflectionException
*/ */
public function onBeforeReload(Server $server) public function onBeforeReload(Server $server)
{ {
@@ -34,6 +35,7 @@ class OnServerReload
/** /**
* @param Server $server * @param Server $server
* @throws \ReflectionException
*/ */
public function onAfterReload(Server $server) public function onAfterReload(Server $server)
{ {
Handler/OnServerWorker.php
+3 -3
View File
@@ -2,12 +2,12 @@
namespace Server\Handler; namespace Server\Handler;
use Note\Inject;
use Exception; use Exception;
use Kiri\Abstracts\Config; use Kiri\Abstracts\Config;
use Kiri\Core\Help; use Kiri\Core\Help;
use Kiri\Events\EventDispatch; use Kiri\Events\EventDispatch;
use Kiri\Kiri; use Kiri\Kiri;
use Note\Inject;
use Server\Events\OnAfterWorkerStart; use Server\Events\OnAfterWorkerStart;
use Server\Events\OnBeforeWorkerStart; use Server\Events\OnBeforeWorkerStart;
use Server\Events\OnTaskerStart as OnTaskStart; use Server\Events\OnTaskerStart as OnTaskStart;
@@ -98,7 +98,7 @@ class OnServerWorker extends \Server\Abstracts\Server
$this->logger->error($message); $this->logger->error($message);
// $this->system_mail($message); $this->system_mail($message);
} }
@@ -109,7 +109,7 @@ class OnServerWorker extends \Server\Abstracts\Server
protected function system_mail($messageContent) protected function system_mail($messageContent)
{ {
try { try {
$email = Config::get('email'); $email = Config::get('email', ['enable' => false]);
if (!empty($email) && ($email['enable'] ?? false) == true) { if (!empty($email) && ($email['enable'] ?? false) == true) {
Help::sendEmail($email, 'Service Error', $messageContent); Help::sendEmail($email, 'Service Error', $messageContent);
} }
ServerCommand.php
+6
View File
@@ -10,6 +10,8 @@ use Kiri\Abstracts\Config;
use Kiri\Events\EventDispatch; use Kiri\Events\EventDispatch;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use Kiri\Kiri; use Kiri\Kiri;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Server\Events\OnServerBeforeStart; use Server\Events\OnServerBeforeStart;
use Swoole\Coroutine; use Swoole\Coroutine;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
@@ -52,6 +54,10 @@ class ServerCommand extends Command
* @param InputInterface $input * @param InputInterface $input
* @param OutputInterface $output * @param OutputInterface $output
* @return int * @return int
* @throws ConfigException
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
* @throws \ReflectionException
* @throws Exception * @throws Exception
*/ */
public function execute(InputInterface $input, OutputInterface $output): int public function execute(InputInterface $input, OutputInterface $output): int
Tasker/OnServerTask.php
-1
View File
@@ -7,7 +7,6 @@ namespace Server\Tasker;
use Note\Inject; use Note\Inject;
use Kiri\Abstracts\Logger; use Kiri\Abstracts\Logger;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use ReflectionException;
use Server\Contract\OnTaskInterface; use Server\Contract\OnTaskInterface;
use Swoole\Server; use Swoole\Server;