objectcache: Log debug message for backend of MainObjectStash

Bug: T234361
Change-Id: I8e33591dc92198269f45a25d14014af633a351f2
(cherry picked from commit bd16c5eb34e9a5dd67581cd4320e36653ddf5a0a)

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 7468bd7..94ca8d2 100644 (file)
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -359,7 +359,15 @@ return [
                                "Cache type \"$id\" is not present in \$wgObjectCaches." );
                }
 
                                "Cache type \"$id\" is not present in \$wgObjectCaches." );
                }
 

-               return ObjectCache::newFromParams( $mainConfig->get( 'ObjectCaches' )[$id] );
+               $params = $mainConfig->get( 'ObjectCaches' )[$id];
+               $logger = $params['logger'] = LoggerFactory::getInstance( $params['loggroup'] ?? 'objectcache' );
+
+               $store = ObjectCache::newFromParams( $params );
+               $logger->debug( 'MainObjectStash using store {class}', [
+                       'class' => get_class( $store )
+               ] );
+
+               return $store;

        },
 
        'MainWANObjectCache' => function ( MediaWikiServices $services ) : WANObjectCache {
        },
 
        'MainWANObjectCache' => function ( MediaWikiServices $services ) : WANObjectCache {

diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index 73f3993..e0f302b 100644 (file)
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -159,7 +159,8 @@ class ObjectCache {
         * @throws InvalidArgumentException
         */
        public static function newFromParams( $params ) {
         * @throws InvalidArgumentException
         */
        public static function newFromParams( $params ) {

-               $params['logger'] = LoggerFactory::getInstance( $params['loggroup'] ?? 'objectcache' );
+               $params['logger'] = $params['logger'] ??
+                       LoggerFactory::getInstance( $params['loggroup'] ?? 'objectcache' );

                if ( !isset( $params['keyspace'] ) ) {
                        $params['keyspace'] = self::getDefaultKeyspace();
                }
                if ( !isset( $params['keyspace'] ) ) {
                        $params['keyspace'] = self::getDefaultKeyspace();
                }