Merge pull request #25959 from nextcloud/techdept/logger/AccessibilityController

AccessibilityController to LoggerInterface
This commit is contained in:
Roeland Jago Douma 2021-03-06 10:51:34 +01:00 committed by GitHub
commit e72f92b777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions

View File

@ -40,9 +40,9 @@ use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataDisplayResponse;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IConfig;
use OCP\ILogger;
use OCP\IRequest;
use OCP\IUserSession;
use Psr\Log\LoggerInterface;
use ScssPhp\ScssPhp\Compiler;
use ScssPhp\ScssPhp\Exception\ParserException;
use ScssPhp\ScssPhp\Formatter\Crunched;
@ -58,7 +58,7 @@ class AccessibilityController extends Controller {
/** @var IConfig */
private $config;
/** @var ILogger */
/** @var LoggerInterface */
private $logger;
/** @var ITimeFactory */
@ -82,7 +82,7 @@ class AccessibilityController extends Controller {
public function __construct(string $appName,
IRequest $request,
IConfig $config,
ILogger $logger,
LoggerInterface $logger,
ITimeFactory $timeFactory,
IUserSession $userSession,
IAppManager $appManager,
@ -146,7 +146,12 @@ class AccessibilityController extends Controller {
'@import "css-variables.scss";'
);
} catch (ParserException $e) {
$this->logger->error($e->getMessage(), ['app' => 'core']);
$this->logger->error($e->getMessage(),
[
'app' => 'core',
'exception' => $e,
]
);
}
}
@ -255,7 +260,12 @@ class AccessibilityController extends Controller {
$scss->compile($variables);
$this->injectedVariables = $variables;
} catch (ParserException $e) {
$this->logger->logException($e, ['app' => 'core']);
$this->logger->error($e->getMessage(),
[
'app' => 'core',
'exception' => $e,
]
);
}
return $variables;
}