Skip to content

Commit 2c0d198

Browse files
committed
update to 0.5.6, support taskworker process
1 parent 56db31f commit 2c0d198

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/OneBot/Driver/Swoole/TopEventListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function onWorkerStart(Server $server)
3737
if ($server->master_pid === $server->worker_pid) {
3838
ProcessManager::initProcess(ONEBOT_PROCESS_MASTER | ONEBOT_PROCESS_WORKER, $server->worker_id);
3939
} else {
40-
ProcessManager::initProcess(ONEBOT_PROCESS_WORKER, $server->worker_id);
40+
ProcessManager::initProcess($server->taskworker ? ONEBOT_PROCESS_WORKER | ONEBOT_PROCESS_TASKWORKER : ONEBOT_PROCESS_WORKER, $server->worker_id);
4141
}
4242
Adaptive::initWithDriver(SwooleDriver::getInstance());
4343
ob_event_dispatcher()->dispatchWithHandler(new WorkerStartEvent());

src/OneBot/global_defines.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
use ZM\Logger\ConsoleLogger;
1414

1515
const ONEBOT_VERSION = '12';
16-
const ONEBOT_LIBOB_VERSION = '0.5.5';
16+
const ONEBOT_LIBOB_VERSION = '0.5.6';
1717

1818
const ONEBOT_JSON = 1;
1919
const ONEBOT_MSGPACK = 2;
@@ -90,15 +90,16 @@ function ob_logger_register(LoggerInterface $logger): void
9090
global $ob_logger;
9191
if ($logger instanceof ConsoleLogger) {
9292
$type = ProcessManager::getProcessType();
93-
$map = [
93+
$type_map = [
9494
ONEBOT_PROCESS_MASTER => 'MST',
9595
ONEBOT_PROCESS_MANAGER => 'MAN',
9696
ONEBOT_PROCESS_WORKER => '#' . ProcessManager::getProcessId(),
9797
ONEBOT_PROCESS_USER => 'USR',
98-
ONEBOT_PROCESS_TASKWORKER => '#' . ProcessManager::getProcessId(),
99-
ONEBOT_PROCESS_MASTER | ONEBOT_PROCESS_WORKER => 'MST#' . ProcessManager::getProcessId(),
98+
(ONEBOT_PROCESS_WORKER | ONEBOT_PROCESS_TASKWORKER) => '%' . ProcessManager::getProcessId(),
99+
(ONEBOT_PROCESS_WORKER | ONEBOT_PROCESS_MASTER) => 'MST#' . ProcessManager::getProcessId(),
100100
];
101-
$logger::$format = '[%date%] [%level%] [' . $map[$type] . '] %body%';
101+
$ss_type = $type_map[$type] ?? ('TYPE*' . $type);
102+
$logger::$format = '[%date%] [%level%] [' . $ss_type . '] %body%';
102103
$logger::$date_format = 'Y-m-d H:i:s';
103104
}
104105
$ob_logger = $logger;

0 commit comments

Comments
 (0)