zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-02 14:25:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix workerman select exit fake fatal bug

Browse Source
This commit is contained in:
crazywhalecc
2023-02-12 19:19:32 +08:00
committed by Jerry
parent fc9e084acb
commit 7cfdbee843
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ZM/Event/Listener/WorkerEventListener.php
View File

@@ -7,6 +7,7 @@ namespace ZM\Event\Listener;
use OneBot\Driver\Coroutine\Adaptive; use OneBot\Driver\Coroutine\Adaptive;
use OneBot\Driver\Coroutine\CoroutineInterface; use OneBot\Driver\Coroutine\CoroutineInterface;
use OneBot\Driver\Process\ProcessManager; use OneBot\Driver\Process\ProcessManager;
use OneBot\Driver\Workerman\Worker;
use OneBot\Util\Singleton; use OneBot\Util\Singleton;
use ZM\Annotation\AnnotationHandler; use ZM\Annotation\AnnotationHandler;
use ZM\Annotation\AnnotationMap; use ZM\Annotation\AnnotationMap;
@@ -85,9 +86,9 @@ class WorkerEventListener
register_shutdown_function(function () { register_shutdown_function(function () {
$error = error_get_last(); $error = error_get_last();
// 下面这段代码的作用就是，不是错误引发的退出时照常退出即可 // 下面这段代码的作用就是，不是错误引发的退出时照常退出即可
if (($error['type'] ?? 0) != 0) { if (($error['type'] ?? 0) === 1) {
logger()->emergency(zm_internal_errcode('E00027') . 'Internal fatal error: ' . $error['message'] . ' at ' . $error['file'] . "({$error['line']})"); logger()->emergency(zm_internal_errcode('E00027') . 'Internal fatal error: ' . $error['message'] . ' at ' . $error['file'] . "({$error['line']})");
} elseif (!isset($error['type'])) { } else {
return; return;
} }
Framework::getInstance()->stop(); Framework::getInstance()->stop();
@@ -119,6 +120,9 @@ class WorkerEventListener
public function onWorkerStart1(): void public function onWorkerStart1(): void
{ {
if (Framework::getInstance()->getDriver()->getName() === 'workerman') {
logger()->debug('Workerman 使用了事件循环：' . Worker::$eventLoopClass);
}
logger()->debug('{is_task}Worker 进程 #{id} 已启动', ['is_task' => ProcessStateManager::isTaskWorker() ? 'Task' : '', 'id' => ProcessManager::getProcessId()]); logger()->debug('{is_task}Worker 进程 #{id} 已启动', ['is_task' => ProcessStateManager::isTaskWorker() ? 'Task' : '', 'id' => ProcessManager::getProcessId()]);
} }

6
src/ZM/Utils/CodeGenerator/PluginGenerator.php
View File

@@ -79,7 +79,11 @@ class PluginGenerator
file_put_contents(zm_dir($plugin_base_dir . '/composer.json'), json_encode($composer_json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)); file_put_contents(zm_dir($plugin_base_dir . '/composer.json'), json_encode($composer_json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
// TODO: 寻找 PHP 运行环境和 Composer 是否在当前目录的情况 // TODO: 寻找 PHP 运行环境和 Composer 是否在当前目录的情况
chdir($plugin_base_dir); chdir($plugin_base_dir);
passthru('composer dump-autoload'); $env = getenv('COMPOSER_EXECUTABLE');
if ($env === false) {
$env = 'composer';
}
passthru(PHP_BINARY . ' ' . escapeshellcmd($env) . ' dump-autoload');
chdir(WORKING_DIR); chdir(WORKING_DIR);
} }
} }