Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 12 additions & 7 deletions src/Logging/LoggerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Amp\Log\ConsoleFormatter;
use Amp\Log\StreamHandler;
use Monolog\Formatter\LineFormatter;
use Monolog\Level;
use Monolog\Logger;
use Monolog\Processor\PsrLogMessageProcessor;
use Phenix\Constants\ServerMode;
Expand All @@ -21,12 +22,16 @@ class LoggerFactory implements Makeable
{
public static function make(string $key, ServerMode $serverMode = ServerMode::SINGLE): Logger
{
/** @var int|string|null $levelConfig */
$levelConfig = Config::get('app.debug_level');
$level = Level::tryFrom((int) $levelConfig) ?? Level::Debug;

if ($serverMode === ServerMode::CLUSTER && Cluster::isWorker()) {
$logHandler = Cluster::createLogHandler();
$logHandler = Cluster::createLogHandler($level);
} else {
$logHandler = match ($key) {
'file' => self::fileHandler(),
'stream' => self::streamHandler(),
'file' => self::fileHandler($level),
'stream' => self::streamHandler($level),
default => throw new RuntimeError("Unsupported logging channel: {$key}"),
};
}
Expand All @@ -37,16 +42,16 @@ public static function make(string $key, ServerMode $serverMode = ServerMode::SI
return $logger;
}

private static function streamHandler(): StreamHandler
private static function streamHandler(Level $level): StreamHandler
{
$logHandler = new StreamHandler(ByteStream\getStdout());
$logHandler = new StreamHandler(ByteStream\getStdout(), $level);
$logHandler->pushProcessor(new PsrLogMessageProcessor());
$logHandler->setFormatter(new ConsoleFormatter());

return $logHandler;
}

private static function fileHandler(): StreamHandler
private static function fileHandler(Level $level): StreamHandler
{
$path = Config::get('logging.path');

Expand All @@ -56,7 +61,7 @@ private static function fileHandler(): StreamHandler

$file = File::openFile($path, 'a');

$logHandler = new StreamHandler($file);
$logHandler = new StreamHandler($file, $level);
$logHandler->pushProcessor(new PsrLogMessageProcessor());
$logHandler->setFormatter(new LineFormatter());

Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/application/config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
*/
'server_mode' => env('APP_SERVER_MODE', static fn (): string => 'single'),
'debug' => env('APP_DEBUG', static fn (): bool => true),
'debug_level' => env('APP_DEBUG_LEVEL', static fn (): int => 100),
'locale' => 'en',
'fallback_locale' => 'en',
'middlewares' => [
Expand Down
Loading