jenkins-bot has submitted this change and it was merged.
Change subject: Fix session store logging
......................................................................
Fix session store logging
Two things were wrong here:
1. SessionManager shouldn't override the configured logger of the
underlying store.
2. CachedBagOStuff shouldn't override the configured logger of the
backend store on construction.
Change-Id: I24ed5a81d5b238a42934a7890dd8d0a9f9bb3b6f
(cherry picked from commit 405c2c8b6b3e1bb258e840bb023bcf0ae800b51f)
---
M includes/libs/objectcache/CachedBagOStuff.php
M includes/session/SessionManager.php
2 files changed, 0 insertions(+), 6 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/libs/objectcache/CachedBagOStuff.php
b/includes/libs/objectcache/CachedBagOStuff.php
index 4ac8dcc..90d7891 100644
--- a/includes/libs/objectcache/CachedBagOStuff.php
+++ b/includes/libs/objectcache/CachedBagOStuff.php
@@ -74,11 +74,6 @@
return true;
}
- public function setLogger( LoggerInterface $logger ) {
- parent::setLogger( $logger );
- $this->backend->setLogger( $logger );
- }
-
public function setDebug( $bool ) {
parent::setDebug( $bool );
$this->backend->setDebug( $bool );
diff --git a/includes/session/SessionManager.php
b/includes/session/SessionManager.php
index 6e4f99c..7ca3045 100644
--- a/includes/session/SessionManager.php
+++ b/includes/session/SessionManager.php
@@ -167,7 +167,6 @@
$store = $options['store'];
} else {
$store = \ObjectCache::getInstance( $this->config->get(
'SessionCacheType' ) );
- $store->setLogger( $this->logger );
}
$this->store = $store instanceof CachedBagOStuff ? $store : new
CachedBagOStuff( $store );
--
To view, visit https://gerrit.wikimedia.org/r/272829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I24ed5a81d5b238a42934a7890dd8d0a9f9bb3b6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.14
Gerrit-Owner: Gergő Tisza <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
