Skip to content

Commit 6879056

Browse files
fix(debug log): Remove Bramus package and make debug log available even in no-dev env
1 parent 009424b commit 6879056

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"geoip2/geoip2": "^2.12.2"
3939
},
4040
"require-dev": {
41-
"bramus/monolog-colored-line-formatter": "^3.0",
4241
"symfony/var-dumper": "^5.2",
4342
"phpunit/phpunit": "8.5.21",
4443
"clean/phpdoc-md": "^0.19.1",

src/AbstractBounce.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
require_once __DIR__.'/templates/captcha.php';
66
require_once __DIR__.'/templates/access-forbidden.php';
77

8-
use Bramus\Monolog\Formatter\ColoredLineFormatter;
98
use ErrorException;
109
use Exception;
1110
use IPLib\Factory;
@@ -97,10 +96,8 @@ protected function initLoggerHelper($logDirectoryPath, $loggerName): void
9796
if ($this->debug) {
9897
$debugLogPath = $logDirectoryPath.'/debug.log';
9998
$debugFileHandler = new RotatingFileHandler($debugLogPath, 0, Logger::DEBUG);
100-
if (class_exists('\Bramus\Monolog\Formatter\ColoredLineFormatter')) {
101-
$debugFileHandler->setFormatter(new ColoredLineFormatter(null, "[%datetime%] %message% %context%\n", 'H:i:s'));
102-
$this->logger->pushHandler($debugFileHandler);
103-
}
99+
$debugFileHandler->setFormatter(new LineFormatter("%datetime%|%level%|%context%\n"));
100+
$this->logger->pushHandler($debugFileHandler);
104101
}
105102
}
106103

tests/TestHelpers.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
use Bramus\Monolog\Formatter\ColoredLineFormatter;
5+
use Monolog\Formatter\LineFormatter;
66
use Monolog\Handler\StreamHandler;
77
use Monolog\Logger;
88
use Symfony\Component\Cache\Adapter\MemcachedAdapter;
@@ -31,7 +31,7 @@ public static function createLogger(): Logger
3131
{
3232
$log = new Logger('TESTS');
3333
$handler = new StreamHandler('php://stdout', self::LOG_LEVEL);
34-
$handler->setFormatter(new ColoredLineFormatter(null, "[%datetime%] %message% %context%\n", 'H:i:s'));
34+
$handler->setFormatter(new LineFormatter("%datetime%|%level%|%context%\n"));
3535
$log->pushHandler($handler);
3636

3737
return $log;

0 commit comments

Comments
 (0)