3 Commits
1.1.6 ... 1.1.8

Author SHA1 Message Date
Jerry Ma
d13c8fb85f Update ConsoleLogger.php 2026-06-17 15:53:31 +09:00
crazywhalecc
c21ddda192 chore: widen PHP version constraint to 8.5 and bump dev deps
- Add PHP 8.2/8.3/8.4/8.5 to version constraint
- Bump php-cs-fixer from ^3.2 to ^3.64
- Bump phpstan from ^1.1 to ^1.12
- Drop phpunit ^8.5 (EOL), keep ^9.0 only
2026-06-17 14:53:05 +08:00
crazywhalecc
d79edcef53 fix: add recursion guard to prevent 100% CPU when STDOUT/STDERR is broken
When the terminal (IDE) is closed without stopping the framework first,
the PTY is destroyed and STDOUT/STDERR become broken file descriptors.
Any subsequent log call via echo/fwrite fails with E_WARNING, the error
handler catches it and calls the logger again, creating a recursive loop
that consumes 100% CPU.

Changes:
- Add static $in_log recursion guard flag to ConsoleLogger
- Wrap log output (echo/fwrite/fflush) with the guard and @ suppression
- Bump version from 1.1.6 to 1.1.7
2026-06-17 14:46:27 +08:00
2 changed files with 31 additions and 14 deletions

View File

@@ -25,7 +25,7 @@
],
"minimum-stability": "stable",
"require": {
"php": "^7.2 || ^7.3 || ^7.4 || ^8.0 || ^8.1",
"php": "^7.2 || ^7.3 || ^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4 || ^8.5",
"psr/log": "^1 || ^2 || ^3",
"symfony/polyfill-mbstring": "^1.0"
},
@@ -37,9 +37,9 @@
"ext-mbstring": "Use C/C++ extension instead of polyfill will be more efficient"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.2",
"phpstan/phpstan": "^1.1",
"phpunit/phpunit": "^8.5 || ^9.0",
"friendsofphp/php-cs-fixer": "^3.64",
"phpstan/phpstan": "^1.12",
"phpunit/phpunit": "^9.0",
"roave/security-advisories": "dev-latest",
"brainmaestro/composer-git-hooks": "^2.8"
},

View File

@@ -10,7 +10,7 @@ use Psr\Log\LogLevel;
class ConsoleLogger extends AbstractLogger
{
public const VERSION = '1.1.6';
public const VERSION = '1.1.8';
/**
* 日志输出格式
@@ -86,6 +86,13 @@ class ConsoleLogger extends AbstractLogger
*/
protected $stream;
/**
* 递归保护标志 — 防止日志写入失败时错误处理器再次调用日志导致死循环 CPU 100%
*
* @var bool
*/
protected static $in_log = false;
/**
* 是否带颜色
*
@@ -242,17 +249,27 @@ class ConsoleLogger extends AbstractLogger
} else {
$output = $output . PHP_EOL;
}
// use stream
if ($this->stream) {
fwrite($this->stream, $output);
fflush($this->stream);
} else {
if ($level <= 4 && $this->use_stderr) {
fwrite(STDERR, $output);
// 递归保护:如果上一次日志写入触发了错误(如终端关闭后 STDOUT/STDERR 破损),
// 跳过本次输出,防止错误处理器递归调用导致 CPU 100% 空耗
if (self::$in_log) {
return;
}
self::$in_log = true;
try {
// use stream
if ($this->stream) {
@fwrite($this->stream, $output);
@fflush($this->stream);
} else {
// use plain text output
echo $output;
if ($level <= 4 && $this->use_stderr) {
@fwrite(STDERR, $output);
} else {
// use plain text output
@echo $output;
}
}
} finally {
self::$in_log = false;
}
}