Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

添加 caller 字段到预设格式中 #6

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

添加 caller 字段到预设格式中 #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9da98fd
add caller to log format
sunxyw Dec 21, 2022
0ee6e43
change method sign to static
sunxyw Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 49 additions & 4 deletions src/ZM/Logger/ConsoleLogger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class ConsoleLogger extends AbstractLogger
*
* @var string
*/
public static $format = '[%date%] [%level%] %body%';
public static $format = '[%date%] [%level%] %caller% %body%';

/**
* 日志输出日期格式
Expand Down Expand Up @@ -139,6 +139,27 @@ public static function getVersion(): string
return self::VERSION;
}

/**
* 插入字段到指定字段之前，或之后
* @param string $field 字段名
* @param string $alter 要插入的字段
* @param string $position 插入位置，before 或 after
*/
public static function alterFormat(string $field, string $alter, string $position = 'before'): void
{
$format = self::$format;
$pos = strpos($format, $field);
if ($pos === false) {
return;
}
if ($position === 'before') {
$format = substr_replace($format, $alter, $pos, 0);
} else {
$format = substr_replace($format, $alter, $pos + strlen($field), 0);
}
self::$format = $format;
}

/**
* 添加静态上下文
*/
Expand Down Expand Up @@ -215,8 +236,13 @@ public function log($level, $message, array $context = []): void
}

$output = str_replace(
['%date%', '%level%', '%body%'],
[date(self::$date_format), strtoupper(substr(self::$levels[$level], 0, 4)), $message],
['%date%', '%level%', '%body%', '%caller%'],
[
date(self::$date_format),
strtoupper(substr(self::$levels[$level], 0, 4)),
$message,
$this->getCaller(),
],
self::$format
);
$output = $this->interpolate($output, array_merge($this->static_context, $context));
Expand All @@ -230,7 +256,7 @@ public function log($level, $message, array $context = []): void
if ($this->decorated) {
$output = $this->colorize($output, $level) . PHP_EOL;
} else {
$output = $output . PHP_EOL;
$output .= PHP_EOL;
}
// use stream
if ($this->stream) {
Expand Down Expand Up @@ -313,4 +339,23 @@ private function interpolate(string $message, array $context = []): string

return strtr($message, $replace);
}

/**
* 获取调用者信息
*/
private function getCaller(): string
{
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
$caller = $trace[1] ?? [];
$file = $caller['file'] ?? '';
if ($file) {
// 截取路径，获取 src 之后至多两级目录
$path = substr($file, strpos($file, 'src') + 4);
$path = explode(DIRECTORY_SEPARATOR, $path);
$path = array_slice($path, 0, 2);
} else {
$path = ['unknown'];
}
return implode(' > ', $path);
}
}