diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2018-09-04 10:05:25 +0200 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2018-09-04 10:05:25 +0200 |
commit | 9319d557a4b1156d82d824cdb1b7d6f07ad3fbde (patch) | |
tree | 72131fa52a79aaacefff9514113f9ba575afd7de /lib/private/AppFramework | |
parent | 373630c78fc88bfb8b1e025432ab705ab98f63c8 (diff) | |
download | nextcloud-server-9319d557a4b1156d82d824cdb1b7d6f07ad3fbde.tar.gz nextcloud-server-9319d557a4b1156d82d824cdb1b7d6f07ad3fbde.zip |
Add wrapper Logger in DIContainer
This makes sure that for example app for the context is always set.
We can in the future extend this to include more info.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'lib/private/AppFramework')
-rw-r--r-- | lib/private/AppFramework/DependencyInjection/DIContainer.php | 5 | ||||
-rw-r--r-- | lib/private/AppFramework/Logger.php | 89 |
2 files changed, 94 insertions, 0 deletions
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 8803ef8c47d..439404f26ce 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -120,6 +120,11 @@ class DIContainer extends SimpleContainer implements IAppContainer { return $this->getServer()->getL10N($c->query('AppName')); }); + // Log wrapper + $this->registerService(ILogger::class, function ($c) { + return new OC\AppFramework\Logger($this->server->query(ILogger::class), $c->query('AppName')); + }); + $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class); $this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class); diff --git a/lib/private/AppFramework/Logger.php b/lib/private/AppFramework/Logger.php new file mode 100644 index 00000000000..438bf15f22b --- /dev/null +++ b/lib/private/AppFramework/Logger.php @@ -0,0 +1,89 @@ +<?php +declare(strict_types=1); +/** + * @copyright Copyright (c) 2018, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OC\AppFramework; + +use OCP\ILogger; + +class Logger implements ILogger { + + /** @var ILogger */ + private $logger; + + /** @var string */ + private $appName; + + public function __construct(ILogger $logger, string $appName) { + $this->logger = $logger; + $this->appName = $appName; + } + + private function extendContext(array $context): array { + if (!isset($context['app'])) { + $context['app'] = $this->appName; + } + + return $context; + } + + public function emergency(string $message, array $context = []) { + $this->logger->emergency($message, $this->extendContext($context)); + } + + public function alert(string $message, array $context = []) { + $this->logger->alert($message, $this->extendContext($context)); + } + + public function critical(string $message, array $context = []) { + $this->logger->critical($message, $this->extendContext($context)); + } + + public function error(string $message, array $context = []) { + $this->logger->emergency($message, $this->extendContext($context)); + } + + public function warning(string $message, array $context = []) { + $this->logger->warning($message, $this->extendContext($context)); + } + + public function notice(string $message, array $context = []) { + $this->logger->notice($message, $this->extendContext($context)); + } + + public function info(string $message, array $context = []) { + $this->logger->info($message, $this->extendContext($context)); + } + + public function debug(string $message, array $context = []) { + $this->logger->debug($message, $this->extendContext($context)); + } + + public function log(int $level, string $message, array $context = []) { + $this->logger->log($level, $message, $this->extendContext($context)); + } + + public function logException(\Throwable $exception, array $context = []) { + $this->logger->logException($exception, $this->extendContext($context)); + } +} |