Skip to content

Commit 1cd808a

Browse files
committed
Logger: renamed $priority -> $level
1 parent 29af14d commit 1cd808a

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

src/Bridges/Psr/PsrToTracyLoggerAdapter.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919
class PsrToTracyLoggerAdapter implements Tracy\ILogger
2020
{
21-
/** Tracy logger priority to PSR-3 log level mapping */
22-
private const PRIORITY_MAP = [
21+
/** Tracy logger level to PSR-3 log level mapping */
22+
private const LEVEL_MAP = [
2323
Tracy\ILogger::DEBUG => Psr\Log\LogLevel::DEBUG,
2424
Tracy\ILogger::INFO => Psr\Log\LogLevel::INFO,
2525
Tracy\ILogger::WARNING => Psr\Log\LogLevel::WARNING,
@@ -38,7 +38,7 @@ public function __construct(Psr\Log\LoggerInterface $psrLogger)
3838
}
3939

4040

41-
public function log($value, $priority = self::INFO)
41+
public function log($value, $level = self::INFO)
4242
{
4343
if ($value instanceof \Throwable) {
4444
$message = Tracy\Helpers::getClass($value) . ': ' . $value->getMessage() . ($value->getCode() ? ' #' . $value->getCode() : '') . ' in ' . $value->getFile() . ':' . $value->getLine();
@@ -54,7 +54,7 @@ public function log($value, $priority = self::INFO)
5454
}
5555

5656
$this->psrLogger->log(
57-
self::PRIORITY_MAP[$priority] ?? Psr\Log\LogLevel::ERROR,
57+
self::LEVEL_MAP[$level] ?? Psr\Log\LogLevel::ERROR,
5858
$message,
5959
$context
6060
);

src/Bridges/Psr/TracyToPsrLoggerAdapter.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919
class TracyToPsrLoggerAdapter extends Psr\Log\AbstractLogger
2020
{
21-
/** PSR-3 log level to Tracy logger priority mapping */
22-
private const PRIORITY_MAP = [
21+
/** PSR-3 log level to Tracy logger level mapping */
22+
private const LEVEL_MAP = [
2323
Psr\Log\LogLevel::EMERGENCY => Tracy\ILogger::CRITICAL,
2424
Psr\Log\LogLevel::ALERT => Tracy\ILogger::CRITICAL,
2525
Psr\Log\LogLevel::CRITICAL => Tracy\ILogger::CRITICAL,
@@ -42,10 +42,10 @@ public function __construct(Tracy\ILogger $tracyLogger)
4242

4343
public function log($level, $message, array $context = [])
4444
{
45-
$priority = self::PRIORITY_MAP[$level] ?? Tracy\ILogger::ERROR;
45+
$level = self::LEVEL_MAP[$level] ?? Tracy\ILogger::ERROR;
4646

4747
if (isset($context['exception']) && $context['exception'] instanceof \Throwable) {
48-
$this->tracyLogger->log($context['exception'], $priority);
48+
$this->tracyLogger->log($context['exception'], $level);
4949
unset($context['exception']);
5050
}
5151

@@ -56,6 +56,6 @@ public function log($level, $message, array $context = [])
5656
];
5757
}
5858

59-
$this->tracyLogger->log($message, $priority);
59+
$this->tracyLogger->log($message, $level);
6060
}
6161
}

src/Tracy/Debugger/Debugger.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,9 +568,9 @@ public static function barDump($var, string $title = null, array $options = [])
568568
* @param mixed $message
569569
* @return mixed
570570
*/
571-
public static function log($message, string $priority = ILogger::INFO)
571+
public static function log($message, string $level = ILogger::INFO)
572572
{
573-
return self::getLogger()->log($message, $priority);
573+
return self::getLogger()->log($message, $level);
574574
}
575575

576576

src/Tracy/Logger/FireLogger.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ class FireLogger implements ILogger
3232
* Sends message to FireLogger console.
3333
* @param mixed $message
3434
*/
35-
public function log($message, $priority = self::DEBUG): bool
35+
public function log($message, $level = self::DEBUG): bool
3636
{
3737
if (!isset($_SERVER['HTTP_X_FIRELOGGER']) || headers_sent()) {
3838
return false;
3939
}
4040

4141
$item = [
4242
'name' => 'PHP',
43-
'level' => $priority,
43+
'level' => $level,
4444
'order' => count($this->payload['logs']),
4545
'time' => str_pad(number_format((microtime(true) - Debugger::$time) * 1000, 1, '.', ' '), 8, '0', STR_PAD_LEFT) . ' ms',
4646
'template' => '',

src/Tracy/Logger/ILogger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ interface ILogger
2323
EXCEPTION = 'exception',
2424
CRITICAL = 'critical';
2525

26-
function log($value, $priority = self::INFO);
26+
function log($value, $level = self::INFO);
2727
}

src/Tracy/Logger/Logger.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ public function __construct(?string $directory, $email = null, BlueScreen $blueS
4949
/**
5050
* Logs message or exception to file and sends email notification.
5151
* @param mixed $message
52-
* @param string $priority one of constant ILogger::INFO, WARNING, ERROR (sends email), EXCEPTION (sends email), CRITICAL (sends email)
52+
* @param string $level one of constant ILogger::INFO, WARNING, ERROR (sends email), EXCEPTION (sends email), CRITICAL (sends email)
5353
* @return string|null logged error filename
5454
*/
55-
public function log($message, $priority = self::INFO)
55+
public function log($message, $level = self::INFO)
5656
{
5757
if (!$this->directory) {
5858
throw new \LogicException('Logging directory is not specified.');
@@ -64,7 +64,7 @@ public function log($message, $priority = self::INFO)
6464
? $this->getExceptionFile($message)
6565
: null;
6666
$line = static::formatLogLine($message, $exceptionFile);
67-
$file = $this->directory . '/' . strtolower($priority ?: self::INFO) . '.log';
67+
$file = $this->directory . '/' . strtolower($level ?: self::INFO) . '.log';
6868

6969
if (!@file_put_contents($file, $line . PHP_EOL, FILE_APPEND | LOCK_EX)) { // @ is escalated to exception
7070
throw new \RuntimeException("Unable to write to log file '$file'. Is directory writable?");
@@ -74,7 +74,7 @@ public function log($message, $priority = self::INFO)
7474
$this->logException($message, $exceptionFile);
7575
}
7676

77-
if (in_array($priority, [self::ERROR, self::EXCEPTION, self::CRITICAL], true)) {
77+
if (in_array($level, [self::ERROR, self::EXCEPTION, self::CRITICAL], true)) {
7878
$this->sendEmail($message);
7979
}
8080

0 commit comments

Comments
 (0)