File tree 2 files changed +7
-6
lines changed
2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ public function onWorkerStart(Server $server)
37
37
if ($ server ->master_pid === $ server ->worker_pid ) {
38
38
ProcessManager::initProcess (ONEBOT_PROCESS_MASTER | ONEBOT_PROCESS_WORKER , $ server ->worker_id );
39
39
} 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 );
41
41
}
42
42
Adaptive::initWithDriver (SwooleDriver::getInstance ());
43
43
ob_event_dispatcher ()->dispatchWithHandler (new WorkerStartEvent ());
Original file line number Diff line number Diff line change 13
13
use ZM \Logger \ConsoleLogger ;
14
14
15
15
const ONEBOT_VERSION = '12 ' ;
16
- const ONEBOT_LIBOB_VERSION = '0.5.5 ' ;
16
+ const ONEBOT_LIBOB_VERSION = '0.5.6 ' ;
17
17
18
18
const ONEBOT_JSON = 1 ;
19
19
const ONEBOT_MSGPACK = 2 ;
@@ -90,15 +90,16 @@ function ob_logger_register(LoggerInterface $logger): void
90
90
global $ ob_logger ;
91
91
if ($ logger instanceof ConsoleLogger) {
92
92
$ type = ProcessManager::getProcessType ();
93
- $ map = [
93
+ $ type_map = [
94
94
ONEBOT_PROCESS_MASTER => 'MST ' ,
95
95
ONEBOT_PROCESS_MANAGER => 'MAN ' ,
96
96
ONEBOT_PROCESS_WORKER => '# ' . ProcessManager::getProcessId (),
97
97
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 (),
100
100
];
101
- $ logger ::$ format = '[%date%] [%level%] [ ' . $ map [$ type ] . '] %body% ' ;
101
+ $ ss_type = $ type_map [$ type ] ?? ('TYPE* ' . $ type );
102
+ $ logger ::$ format = '[%date%] [%level%] [ ' . $ ss_type . '] %body% ' ;
102
103
$ logger ::$ date_format = 'Y-m-d H:i:s ' ;
103
104
}
104
105
$ ob_logger = $ logger ;
You can’t perform that action at this time.
0 commit comments