diff options
| author | mainframe98 <k.s.werf@hotmail.com> | 2022-02-06 20:18:27 +0100 |
|---|---|---|
| committer | Mainframe98 <k.s.werf@hotmail.com> | 2022-02-10 19:46:40 +0000 |
| commit | cda85436197c208edbd77d06dd64c138b0166b1f (patch) | |
| tree | c64461286c08629352f3f5ed3bc9c6b219ddcf55 /includes/db | |
| parent | 92d02f0d380e529ece6b78fcd7965bc8d5b3f01a (diff) | |
| download | mediawikicore-cda85436197c208edbd77d06dd64c138b0166b1f.tar.gz mediawikicore-cda85436197c208edbd77d06dd64c138b0166b1f.zip | |
rdbms: use existing config in MWLBFactory::applyDefaultConfig
Calling the service locator in code used in the service wiring is
asking for trouble.
I found this using some arcane hack that calls applyDefaultConfig
in its own, pre-setup, service locator.
A perfectly good ServiceOptions is available, with much less
indirection. Makes the thing more testable too.
Follow-up to I1a691f01cd82e60bf41207d32501edb4b9835e37.
Change-Id: I38d4db2b7d897ebbceac8e773bb0512a8fc484d3
Diffstat (limited to 'includes/db')
| -rw-r--r-- | includes/db/MWLBFactory.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php index 49bb0c5a961c..741e2c1b9a9a 100644 --- a/includes/db/MWLBFactory.php +++ b/includes/db/MWLBFactory.php @@ -23,7 +23,6 @@ use MediaWiki\Config\ServiceOptions; use MediaWiki\Logger\LoggerFactory; -use MediaWiki\MediaWikiServices; use Wikimedia\Rdbms\ChronologyProtector; use Wikimedia\Rdbms\DatabaseDomain; use Wikimedia\Rdbms\IDatabase; @@ -46,6 +45,7 @@ abstract class MWLBFactory { * @internal For use by ServiceWiring */ public const APPLY_DEFAULT_CONFIG_OPTIONS = [ + 'CommandLineMode', 'DBcompress', 'DBDefaultGroup', 'DBmwschema', @@ -88,8 +88,6 @@ abstract class MWLBFactory { ) { $options->assertRequiredOptions( self::APPLY_DEFAULT_CONFIG_OPTIONS ); - $commandLineMode = MediaWikiServices::getInstance()->getMainConfig()->get( 'CommandLineMode' ); - $typesWithSchema = self::getDbTypesWithSchemas(); $lbConf += [ @@ -108,7 +106,7 @@ abstract class MWLBFactory { 'perfLogger' => LoggerFactory::getInstance( 'DBPerformance' ), 'errorLogger' => [ MWExceptionHandler::class, 'logException' ], 'deprecationLogger' => [ static::class, 'logDeprecation' ], - 'cliMode' => $commandLineMode, + 'cliMode' => $options->get( 'CommandLineMode' ), 'readOnlyReason' => $readOnlyMode->getReason(), 'defaultGroup' => $options->get( 'DBDefaultGroup' ), 'criticalSectionProvider' => $csProvider |