This commit is contained in:
2021-03-03 10:15:16 +08:00
parent 394e936292
commit 4bd4db9f9b
3 changed files with 0 additions and 111 deletions
-5
View File
@@ -51,7 +51,6 @@ class OnTask extends Callback
*/
public function onTask(Server $server, int $task_id, int $from_id, string $data): mixed
{
var_dump($task_id, $from_id, $data);
if (empty($data)) {
return $server->finish('null data');
}
@@ -77,7 +76,6 @@ class OnTask extends Callback
*/
public function onContinueTask(Server $server, Server\Task $task): mixed
{
var_dump($task);
if (empty($task->data)) {
return $task->finish('null data');
}
@@ -103,7 +101,6 @@ class OnTask extends Callback
*/
private function runTaskHandler($data): ?array
{
$app = Snowflake::app()->increment();
try {
$serialize = $this->before($data);
$params = $serialize->getParams();
@@ -118,8 +115,6 @@ class OnTask extends Callback
$finish['status'] = 'error';
$finish['info'] = $this->format($exception);
$this->error($exception, 'Task');
} finally {
$app->decrement();
}
return $finish;
}
-34
View File
@@ -24,10 +24,6 @@ class OnWorkerStart extends Callback
{
/** @var int 重启信号 */
private int $signal = SIGUSR1 | SIGKILL | SIGKILL;
/**
* @param Server $server
* @param int $worker_id
@@ -85,36 +81,6 @@ class OnWorkerStart extends Callback
}
/**
* @param $server
* @param $worker_id
* @return void
*/
public function onSignal(Server $server, $worker_id): mixed
{
$ret = Coroutine::waitSignal($this->signal, -1);
if ($ret === true) {
$this->ticker();
}
return $server->stop();
}
/**
* @return void
*/
private function ticker(): void
{
if (!Snowflake::app()->isRun()) {
return;
}
sleep(1);
$this->ticker();
}
/**
* @param $socket
* @param $worker_id
-72
View File
@@ -51,11 +51,6 @@ abstract class BaseApplication extends Service
use TraitApplication;
private int $state = SWOOLE_WORKER_IDLE;
private int $taskNumber = 0;
/**
* @var string
*/
@@ -84,73 +79,6 @@ abstract class BaseApplication extends Service
}
/**
* @return bool
*/
public function isRun(): bool
{
return $this->taskNumber > 0;
}
/**
* @return $this
*/
public function stateInit(): static
{
$this->taskNumber = 0;
$this->state = SWOOLE_WORKER_IDLE;
return $this;
}
/**
* @return $this
* @throws ComponentException
*/
public function decrement(): static
{
$this->taskNumber -= 1;
if ($this->taskNumber <= 0) {
$this->taskNumber = 0;
$this->state = SWOOLE_WORKER_IDLE;
} else {
$this->state = SWOOLE_WORKER_BUSY;
}
return $this->print_task_is_idle(__METHOD__);
}
/**
* @param $method
* @return BaseApplication
* @throws ComponentException
*/
private function print_task_is_idle($method): static
{
$this->warning(sprintf('%s %s:%d state %d has number %d', $method, Snowflake::getEnvironmental(), env('worker'), $this->state, $this->taskNumber));
return $this;
}
/**
* @return $this
* @throws ComponentException
*/
public function increment(): static
{
$this->taskNumber += 1;
if ($this->taskNumber < 1) {
$this->taskNumber = 0;
$this->state = SWOOLE_WORKER_IDLE;
} else {
$this->state = SWOOLE_WORKER_BUSY;
}
return $this->print_task_is_idle(__METHOD__);
}
/**
* @return array
*/