This commit is contained in:
2021-07-21 11:25:31 +08:00
parent 3b05c856ef
commit 8f6079b040
9 changed files with 201 additions and 112 deletions
+26 -1
View File
@@ -3,8 +3,10 @@
namespace Server;
use Closure;
use Exception;
use ReflectionException;
use Server\SInterface\CustomProcess;
use Server\SInterface\TaskExecute;
use Server\Task\ServerTask;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake;
@@ -173,7 +175,7 @@ class ServerManager extends Abstracts\Server
* @param array $config
* @throws NotFindClassException
* @throws ReflectionException
* @throws \Exception
* @throws Exception
*/
private function startListenerHandler(ServerManager $context, array $config)
{
@@ -355,6 +357,29 @@ class ServerManager extends Abstracts\Server
}
/**
* @param TaskExecute|string $handler
* @param array $params
* @param int $workerId
* @throws Exception
*/
public function task(TaskExecute|string $handler, array $params = [], int $workerId = 0)
{
if ($workerId === null || $workerId <= $this->server->setting['worker_num']) {
$workerId = random_int($this->server->setting['worker_num'] + 1,
$this->server->setting['worker_num'] + 1 + $this->server->setting['task_worker_num']);
}
if (is_string($handler)) {
$implements = Snowflake::getDi()->getReflect($handler);
if (!in_array(TaskExecute::class, $implements->getInterfaceNames())) {
throw new Exception('Task must instance ' . TaskExecute::class);
}
$handler = $implements->newInstanceArgs($params);
}
$this->server->task(serialize($handler), $workerId);
}
/**
* @param array $events
* @throws NotFindClassException
+64 -5
View File
@@ -3,12 +3,15 @@
namespace Server\Worker;
use Exception;
use Psr\Log\Test\TestLogger;
use Server\Constant;
use Server\ServerManager;
use Snowflake\Abstracts\Config;
use Snowflake\Event;
use Snowflake\Runtime;
use Snowflake\Snowflake;
use Swoole\Server;
use Swoole\Timer;
/**
@@ -30,15 +33,16 @@ class ServerWorker extends \Server\Abstracts\Server
$annotation = Snowflake::app()->getAnnotation();
$annotation->read(APP_PATH . 'app');
$loader = Snowflake::app()->getRouter();
$loader->_loader();
$this->runEvent(Constant::WORKER_START, null, [$server, $workerId]);
if ($workerId >= $server->setting['worker_num'] + 1) {
$loader = Snowflake::app()->getRouter();
$loader->_loader();
$annotation->runtime(CONTROLLER_PATH);
$annotation->runtime(MODEL_PATH);
} else {
$annotation->runtime(APP_PATH, [CONTROLLER_PATH]);
}
Event::trigger(Event::SERVER_ON_WORKER_START, [$server, $workerId]);
name($server->worker_pid, 'Worker.' . $workerId);
}
@@ -62,20 +66,34 @@ class ServerWorker extends \Server\Abstracts\Server
/**
* @param Server $server
* @param int $workerId
* @throws Exception
*/
public function onWorkerStop(Server $server, int $workerId)
{
$this->runEvent(Constant::WORKER_STOP, null, [$server, $workerId]);
Event::trigger(Event::SERVER_WORKER_STOP);
fire(Event::SYSTEM_RESOURCE_CLEAN);
Timer::clearAll();
}
/**
* @param Server $server
* @param int $workerId
* @throws Exception
*/
public function onWorkerExit(Server $server, int $workerId)
{
$this->runEvent(Constant::WORKER_EXIT, null, [$server, $workerId]);
putenv('state=exit');
Event::trigger(Event::SERVER_WORKER_EXIT, [$server, $worker_id]);
Snowflake::getApp('logger')->insert();
}
@@ -85,10 +103,51 @@ class ServerWorker extends \Server\Abstracts\Server
* @param int $worker_pid
* @param int $exit_code
* @param int $signal
* @throws Exception
*/
public function onWorkerError(Server $server, int $worker_id, int $worker_pid, int $exit_code, int $signal)
{
$this->runEvent(Constant::WORKER_ERROR, null, [$server, $worker_id, $worker_pid, $exit_code, $signal]);
Event::trigger(Event::SERVER_WORKER_ERROR);
$message = sprintf('Worker#%d::%d error stop. signal %d, exit_code %d, msg %s',
$worker_id, $worker_pid, $signal, $exit_code, swoole_strerror(swoole_last_error(), 9)
);
write($message, 'worker-exit');
$this->system_mail($message);
}
/**
* @param $messageContent
* @throws Exception
*/
protected function system_mail($messageContent)
{
try {
$email = Config::get('email');
if (empty($email) || !$email['enable']) {
return;
}
$transport = (new \Swift_SmtpTransport($email['host'], $email['465']))
->setUsername($email['username'])
->setPassword($email['password']);
$mailer = new \Swift_Mailer($transport);
// Create a message
$message = (new \Swift_Message('Wonderful Subject'))
->setFrom([$email['send']['address'] => $email['send']['nickname']])
->setBody('Here is the message itself');
foreach ($email['receive'] as $item) {
$message->setTo([$item['address'], $item['address'] => $item['nickname']]);
}
$mailer->send($messageContent);
} catch (\Throwable $e) {
error($e, 'email');
}
}
}