jenkins-bot has submitted this change and it was merged.
Change subject: Do not require that a Monolog handler has a formatter
......................................................................
Do not require that a Monolog handler has a formatter
Not all handlers require a formatter.
Change-Id: Ifb31aa278d4e90b7fa3a2b7bf3b20173b8345afd
---
M includes/debug/logger/monolog/Spi.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/debug/logger/monolog/Spi.php
b/includes/debug/logger/monolog/Spi.php
index c43e3d6..4ad5687 100644
--- a/includes/debug/logger/monolog/Spi.php
+++ b/includes/debug/logger/monolog/Spi.php
@@ -218,7 +218,11 @@
if ( !isset( $this->singletons['handlers'][$name] ) ) {
$spec = $this->config['handlers'][$name];
$handler = ObjectFactory::getObjectFromSpec( $spec );
- $handler->setFormatter( $this->getFormatter(
$spec['formatter'] ) );
+ if ( isset( $spec['formatter'] ) ) {
+ $handler->setFormatter(
+ $this->getFormatter( $spec['formatter']
)
+ );
+ }
$this->singletons['handlers'][$name] = $handler;
}
return $this->singletons['handlers'][$name];
--
To view, visit https://gerrit.wikimedia.org/r/179542
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb31aa278d4e90b7fa3a2b7bf3b20173b8345afd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits