Page MenuHomePhorge
Files F584904

No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index a3eb344ff60..131919afc64 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -56,6 +56,7 @@ use Wikimedia\AtEase\AtEase;
use Wikimedia\Message\MessageSpecifier;
use Wikimedia\ParamValidator\ParamValidator;
use Wikimedia\ParamValidator\TypeDef\IntegerDef;
+use Wikimedia\ScopedCallback;
use Wikimedia\Stats\StatsFactory;
use Wikimedia\Timestamp\TimestampException;
@@ -2002,7 +2003,12 @@ class ApiMain extends ApiBase {
$this->setupExternalResponse( $module, $params );
}
+ $scope = LoggerFactory::getContext()->addScoped( [
+ 'context.api_module_name' => $module->getModuleName(),
+ 'context.api_client_useragent' => $this->getUserAgent(),
+ ] );
$module->execute();
+ ScopedCallback::consume( $scope );
$this->getHookRunner()->onAPIAfterExecute( $module );
$this->reportUnusedParams();
diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index 855741d3044..1a1139485f8 100644
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -24,6 +24,7 @@ namespace MediaWiki\Api;
use DumpStringOutput;
use MediaWiki\Export\WikiExporterFactory;
+use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Title\Title;
@@ -32,6 +33,7 @@ use MediaWiki\Title\TitleFormatter;
use WikiExporter;
use Wikimedia\ObjectFactory\ObjectFactory;
use Wikimedia\ParamValidator\ParamValidator;
+use Wikimedia\ScopedCallback;
use XmlDumpWriter;
/**
@@ -731,7 +733,11 @@ class ApiQuery extends ApiBase {
$params = $module->extractRequestParams();
$cacheMode = $this->mergeCacheMode(
$cacheMode, $module->getCacheMode( $params ) );
+ $scope = LoggerFactory::getContext()->addScoped( [
+ 'context.api_query_module_name' => $module->getModuleName(),
+ ] );
$module->execute();
+ ScopedCallback::consume( $scope );
$timer->stop();

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jul 5, 5:31 AM (9 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
227396
Default Alt Text
(1 KB)

Event Timeline