zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-03-17 20:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix logger constructor

Browse Source
This commit is contained in:
sunxyw 2022-05-31 00:51:26 +08:00
parent 80050f11f2
commit 23a6e56478
No known key found for this signature in database
GPG Key ID: CEA01A083E98C578
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/logging.php
View File

@ -7,17 +7,17 @@ use Psr\Log\LogLevel;
use ZM\Logger\ConsoleLogger;
return [
'level' => LogLevel::DEBUG,
'logger' => static function (string $title = null): LoggerInterface {
if ($title) {
$title = strtoupper($title);
'level' => LogLevel::INFO,
'logger' => static function (string $prefix = null): LoggerInterface {
if ($prefix) {
$prefix = strtoupper($prefix);
} else {
// 在 Master 中，worker_id 将不存在
$title = app()->has('worker_id') ? '#' . app('worker_id') : 'MST';
$prefix = app()->has('worker_id') ? '#' . app('worker_id') : 'MST';
}
$logger = new ConsoleLogger(zm_config('logging.level'));
$logger::$format = "[%date%] [%level%] [{$title}] %body%";
$logger::$format = "[%date%] [%level%] [{$prefix}] %body%";
$logger::$date_format = 'Y-m-d H:i:s';
// 如果你喜欢旧版的日志格式，请取消下行注释
// $logger::$date_format = 'm-d H:i:s';

2
src/ZM/Container/ContainerServicesProvider.php
View File

@ -79,7 +79,7 @@ class ContainerServicesProvider
$container->instance('worker_id', Framework::$server->worker_id);
$container->singleton(AdapterInterface::class, OneBot11Adapter::class);
$container->singleton(LoggerInterface::class, ZMConfig::get('logging.logger'));
$container->instance(LoggerInterface::class, ZMConfig::get('logging.logger')());
}
/**

6
src/ZM/global_functions.php
View File

@ -788,10 +788,10 @@ function is_assoc_array(array $array): bool
/**
* 返回 Logger 实例
*/
function logger(...$args): LoggerInterface
function logger(string $prefix = null): LoggerInterface
{
if (!app()->has(LoggerInterface::class)) {
return zm_config('logging.logger')(...$args);
if (!is_null($prefix) || !app()->has(LoggerInterface::class)) {
return zm_config('logging.logger')($prefix);
}
return resolve(LoggerInterface::class);
}