aboutsummaryrefslogtreecommitdiffstats
path: root/includes/filebackend
diff options
context:
space:
mode:
authorAaron Schulz <aschulz@wikimedia.org>2019-03-13 11:14:19 -0700
committerKrinkle <krinklemail@gmail.com>2019-03-14 23:03:09 +0000
commitc25d8111bed4c07489537aa733366d60159cd606 (patch)
tree9dc8a26089497481df46557f7960d8166794150d /includes/filebackend
parentb438db9e2c45fcfa923d8f0ae19cfab5cf583457 (diff)
downloadmediawikicore-c25d8111bed4c07489537aa733366d60159cd606.tar.gz
mediawikicore-c25d8111bed4c07489537aa733366d60159cd606.zip
filebackend: change "profiler" parameter in FileBackend so it works again
The Profiler::profileIn and Profiler::profileOut methods are just stubs. Use a callback to the Profile::scopedProfileIn method instead. Change-Id: I7b493c145357994f61faebfbe3f65d38d2e6da42
Diffstat (limited to 'includes/filebackend')
-rw-r--r--includes/filebackend/FileBackendGroup.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/filebackend/FileBackendGroup.php b/includes/filebackend/FileBackendGroup.php
index cbf9bff93fef..a09160827b28 100644
--- a/includes/filebackend/FileBackendGroup.php
+++ b/includes/filebackend/FileBackendGroup.php
@@ -189,7 +189,9 @@ class FileBackendGroup {
'wanCache' => MediaWikiServices::getInstance()->getMainWANObjectCache(),
'srvCache' => ObjectCache::getLocalServerInstance( 'hash' ),
'logger' => LoggerFactory::getInstance( 'FileOperation' ),
- 'profiler' => Profiler::instance()
+ 'profiler' => function ( $section ) {
+ return Profiler::instance()->scopedProfileIn( $section );
+ }
];
$config['lockManager'] =
LockManagerGroup::singleton( $config['wikiId'] )->get( $config['lockManager'] );