From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Mon, 22 Feb 2016 14:01:25 +0000 (-0500)
Subject: Fix session store logging
X-Git-Tag: 1.31.0-rc.0~7876^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=405c2c8b6b3e1bb258e840bb023bcf0ae800b51f;p=lhc%2Fweb%2Fwiklou.git

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
---

diff --git a/includes/libs/objectcache/CachedBagOStuff.php b/includes/libs/objectcache/CachedBagOStuff.php
index c71b16e502..798357d596 100644
--- a/includes/libs/objectcache/CachedBagOStuff.php
+++ b/includes/libs/objectcache/CachedBagOStuff.php
@@ -76,11 +76,6 @@ class CachedBagOStuff extends HashBagOStuff {
 		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 0abec1be4e..8695b689b1 100644
--- a/includes/session/SessionManager.php
+++ b/includes/session/SessionManager.php
@@ -168,7 +168,6 @@ final class SessionManager implements SessionManagerInterface {
 			$store = $options['store'];
 		} else {
 			$store = \ObjectCache::getInstance( $this->config->get( 'SessionCacheType' ) );
-			$store->setLogger( $this->logger );
 		}
 		$this->store = $store instanceof CachedBagOStuff ? $store : new CachedBagOStuff( $store );