mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19030 from owncloud/oparoz-smarter-logger 

[jenkins] Dump Arrays, Objects and Exceptions to the log
This commit is contained in:
Thomas Müller 2015-09-25 14:15:59 +02:00
parent f56c8288ca 866f84189b
commit 8432c73611
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit 338ab170afcb4770e79cc4427a9803cb29a0a230 Subproject commit 3cd7b7048e33e0076c1f94cf2ed721934e0c4977

15
lib/private/log.php
View File

@ -3,6 +3,7 @@
* @author Bart Visscher <bartv@thisnet.nl> * @author Bart Visscher <bartv@thisnet.nl>
* @author Bernhard Posselt <dev@bernhard-posselt.com> * @author Bernhard Posselt <dev@bernhard-posselt.com>
* @author Morris Jobke <hey@morrisjobke.de> * @author Morris Jobke <hey@morrisjobke.de>
* @author Olivier Paroz <owncloud@oparoz.com>
* @author Robin Appelman <icewind@owncloud.com> * @author Robin Appelman <icewind@owncloud.com>
* @author Thomas Müller <thomas.mueller@tmit.eu> * @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Victor Dubiniuk <dubiniuk@owncloud.com>
@ -26,6 +27,8 @@
namespace OC; namespace OC;
use InterfaSys\LogNormalizer\Normalizer;
use \OCP\ILogger; use \OCP\ILogger;
use OCP\Security\StringUtils; use OCP\Security\StringUtils;
@ -48,12 +51,15 @@ class Log implements ILogger {
/** @var boolean|null cache the result of the log condition check for the request */ /** @var boolean|null cache the result of the log condition check for the request */
private $logConditionSatisfied = null; private $logConditionSatisfied = null;
/** @var Normalizer */
private $normalizer;
/** /**
* @param string $logger The logger that should be used * @param string $logger The logger that should be used
* @param SystemConfig $config the system config object * @param SystemConfig $config the system config object
* @param null $normalizer
*/ */
public function __construct($logger=null, SystemConfig $config=null) { public function __construct($logger=null, SystemConfig $config=null, $normalizer = null) {
// FIXME: Add this for backwards compatibility, should be fixed at some point probably // FIXME: Add this for backwards compatibility, should be fixed at some point probably
if($config === null) { if($config === null) {
$config = \OC::$server->getSystemConfig(); $config = \OC::$server->getSystemConfig();
@ -68,6 +74,11 @@ class Log implements ILogger {
} else { } else {
$this->logger = $logger; $this->logger = $logger;
} }
if ($normalizer === null) {
$this->normalizer = new Normalizer();
} else {
$this->normalizer = $normalizer;
}
} }
@ -175,6 +186,8 @@ class Log implements ILogger {
$minLevel = min($this->config->getValue('loglevel', \OCP\Util::WARN), \OCP\Util::ERROR); $minLevel = min($this->config->getValue('loglevel', \OCP\Util::WARN), \OCP\Util::ERROR);
$logCondition = $this->config->getValue('log.condition', []); $logCondition = $this->config->getValue('log.condition', []);
array_walk($context, [$this->normalizer, 'format']);
if (isset($context['app'])) { if (isset($context['app'])) {
$app = $context['app']; $app = $context['app'];