IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Laravel 5.6 #1221

Browse Source
This commit is contained in:
James Cole
2018-03-07 20:37:00 +01:00
parent c76b634d0b
commit 0a056ad02d
6 changed files with 368 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
bootstrap/app.php
View File

@@ -70,37 +70,37 @@ $app->singleton(
FireflyIII\Exceptions\Handler::class
);
/* Overrule logging if not Sandstorm */
if (!(env('IS_SANDSTORM') === true)) {
$app->configureMonologUsing(
function (Logger $monolog) use ($app) {
$interface = php_sapi_name();
$path = $app->storagePath() . '/logs/ff3-' . $interface . '.log';
$level = 'debug';
if ($app->bound('config')) {
$level = $app->make('config')->get('app.log_level', 'debug');
}
$levels = [
'debug' => Logger::DEBUG,
'info' => Logger::INFO,
'notice' => Logger::NOTICE,
'warning' => Logger::WARNING,
'error' => Logger::ERROR,
'critical' => Logger::CRITICAL,
'alert' => Logger::ALERT,
'emergency' => Logger::EMERGENCY,
];
$useLevel = $levels[$level];
$formatter = new LineFormatter(null, null, true, true);
$handler = new RotatingFileHandler($path, 5, $useLevel);
$handler->setFormatter($formatter);
$monolog->pushHandler($handler);
}
);
}
///* Overrule logging if not Sandstorm */
//if (!(env('IS_SANDSTORM') === true)) {
// $app->configureMonologUsing(
// function (Logger $monolog) use ($app) {
//
// $interface = php_sapi_name();
// $path = $app->storagePath() . '/logs/ff3-' . $interface . '.log';
// $level = 'debug';
// if ($app->bound('config')) {
// $level = $app->make('config')->get('app.log_level', 'debug');
// }
// $levels = [
// 'debug' => Logger::DEBUG,
// 'info' => Logger::INFO,
// 'notice' => Logger::NOTICE,
// 'warning' => Logger::WARNING,
// 'error' => Logger::ERROR,
// 'critical' => Logger::CRITICAL,
// 'alert' => Logger::ALERT,
// 'emergency' => Logger::EMERGENCY,
// ];
//
// $useLevel = $levels[$level];
//
// $formatter = new LineFormatter(null, null, true, true);
// $handler = new RotatingFileHandler($path, 5, $useLevel);
// $handler->setFormatter($formatter);
// $monolog->pushHandler($handler);
// }
// );
//}
/*
|--------------------------------------------------------------------------