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

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-03-26 02:12:34 +08:00
parent 451491e928
commit 9c557aac19
5 changed files with 128 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Server.php
+2 -5
View File
@@ -23,7 +23,7 @@ use Rpc\Service;
use Snowflake\Abstracts\Config;
use Snowflake\Core\Json;
use Snowflake\Crontab\Consumer;
use Snowflake\Crontab\CrontabZookeeperProcess;
use Snowflake\Crontab\ZookeeperProcess;
use Snowflake\Error\LoggerProcess;
use Snowflake\Event;
use Snowflake\Exception\ComponentException;
@@ -133,10 +133,7 @@ class Server extends HttpService
public function start(): string
{
$configs = Config::get('servers', true);
if (Config::get('crontab.enable') === true) {
$this->addProcess('CrontabZookeeper', CrontabZookeeperProcess::class);
$this->addProcess('CrontabConsumer', Consumer::class);
}
$baseServer = $this->initCore($configs);
if (!$baseServer) {
return 'ok';
System/Abstracts/BaseApplication.php
-1
View File
@@ -463,7 +463,6 @@ abstract class BaseApplication extends Service
'jwt' => ['class' => Jwt::class],
'async' => ['class' => Async::class],
'filter' => ['class' => HttpFilter::class],
'crontab' => ['class' => \Snowflake\Crontab\Producer::class],
'object' => ['class' => ObjectPool::class],
'goto' => ['class' => BaseGoto::class],
'rpc' => ['class' => \Rpc\Producer::class],
System/Application.php
+89 -84
View File
@@ -20,6 +20,7 @@ use Snowflake\Abstracts\BaseApplication;
use Snowflake\Abstracts\Config;
use Snowflake\Abstracts\Input;
use Snowflake\Abstracts\Kernel;
use Snowflake\Crontab\CrontabProviders;
use Snowflake\Exception\ComponentException;
use Snowflake\Exception\NotFindClassException;
use Snowflake\Exception\NotFindPropertyException;
@@ -37,102 +38,106 @@ use function Co\run;
class Application extends BaseApplication
{
/**
* @var string
*/
public string $id = 'uniqueId';
/**
* @var string
*/
public string $id = 'uniqueId';
public string $state = '';
public string $state = '';
/**
* @throws NotFindClassException
*/
public function init()
{
$this->import(ConsoleProviders::class);
$this->import(DatabasesProviders::class);
$this->import(ServerProviders::class);
}
/**
* @throws NotFindClassException
*/
public function init()
{
$this->import(ConsoleProviders::class);
$this->import(DatabasesProviders::class);
$this->import(ServerProviders::class);
if (Config::get('crontab.enable') !== true) {
$this->import(CrontabProviders::class);
}
}
/**
* @param string $service
* @return $this
* @throws
*/
public function import(string $service): static
{
if (!class_exists($service)) {
throw new NotFindClassException($service);
}
$class = Snowflake::createObject($service);
if (method_exists($class, 'onImport')) {
$class->onImport($this);
}
return $this;
}
/**
* @param string $service
* @return $this
* @throws
*/
public function import(string $service): static
{
if (!class_exists($service)) {
throw new NotFindClassException($service);
}
$class = Snowflake::createObject($service);
if (method_exists($class, 'onImport')) {
$class->onImport($this);
}
return $this;
}
/**
* @param $kernel
* @return $this
*/
public function commands(Kernel $kernel): static
{
foreach ($kernel->getCommands() as $command) {
$this->register($command);
}
return $this;
}
/**
* @param $kernel
* @return $this
*/
public function commands(Kernel $kernel): static
{
foreach ($kernel->getCommands() as $command) {
$this->register($command);
}
return $this;
}
/**
* @param string $command
* @throws
*/
public function register(string $command)
{
/** @var Console $abstracts */
$abstracts = $this->get('console');
$abstracts->register($command);
}
/**
* @param string $command
* @throws
*/
public function register(string $command)
{
/** @var Console $abstracts */
$abstracts = $this->get('console');
$abstracts->register($command);
}
/**
* @param Input $argv
* @return void
* @throws Exception
*/
public function start(Input $argv): void
{
try {
fire(Event::SERVER_BEFORE_START);
/**
* @param Input $argv
* @return void
* @throws Exception
*/
public function start(Input $argv): void
{
try {
fire(Event::SERVER_BEFORE_START);
$manager = Snowflake::app()->get('console');
$manager->setParameters($argv);
$class = $manager->search();
response()->send($manager->execCommand($class));
} catch (\Throwable $exception) {
response()->send(implode("\n", [
'Msg: ' . $exception->getMessage(),
'Line: ' . $exception->getLine(),
'File: ' . $exception->getFile()
]));
} finally {
Timer::clearAll();
}
}
$manager = Snowflake::app()->get('console');
$manager->setParameters($argv);
$class = $manager->search();
response()->send($manager->execCommand($class));
} catch (\Throwable $exception) {
response()->send(implode("\n", [
'Msg: ' . $exception->getMessage(),
'Line: ' . $exception->getLine(),
'File: ' . $exception->getFile()
]));
} finally {
Timer::clearAll();
}
}
/**
* @param $className
* @param null $abstracts
* @return stdClass
* @throws Exception
*/
public function make($className, $abstracts = null): stdClass
{
return make($className, $abstracts);
}
/**
* @param $className
* @param null $abstracts
* @return stdClass
* @throws Exception
*/
public function make($className, $abstracts = null): stdClass
{
return make($className, $abstracts);
}
}
System/Crontab/CrontabProviders.php
+35
View File
@@ -0,0 +1,35 @@
<?php
namespace Snowflake\Crontab;
use Snowflake\Abstracts\Config;
use Snowflake\Abstracts\Providers;
use Snowflake\Application;
/**
* Class CrontabProviders
* @package Snowflake\Crontab
*/
class CrontabProviders extends Providers
{
/**
* @param Application $application
*/
public function onImport(Application $application)
{
$server = $application->getServer();
if (Config::get('crontab.enable') !== true) {
return;
}
$application->set('crontab', ['class' => Producer::class]);
$server->addProcess('CrontabZookeeper', ZookeeperProcess::class);
$server->addProcess('Consumer', Consumer::class);
}
}
System/Crontab/CrontabZookeeperProcess.php → System/Crontab/ZookeeperProcess.php
+2 -2
View File
@@ -17,10 +17,10 @@ use Swoole\Coroutine\Channel;
use Swoole\Timer;
/**
* Class CrontabZookeeperProcess
* Class ZookeeperProcess
* @package Snowflake\Process
*/
class CrontabZookeeperProcess extends Process
class ZookeeperProcess extends Process
{