Ppchelko has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376574 )
Change subject: Reuse the request_id that the job sets, not the x-request-id.
......................................................................
Reuse the request_id that the job sets, not the x-request-id.
Change-Id: Ice5b99b28d28801e45722e86efd3e77fce7ecaa3
---
M JobQueueEventBus.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventBus
refs/changes/74/376574/1
diff --git a/JobQueueEventBus.php b/JobQueueEventBus.php
index 18259ad..73fb6d2 100644
--- a/JobQueueEventBus.php
+++ b/JobQueueEventBus.php
@@ -32,11 +32,16 @@
$attrs['params'] = $params;
- return EventBus::createEvent(
+ $event = EventBus::createEvent(
EventBus::getArticleURL( $job->getTitle() ),
'mediawiki.job.' . $job->getType(),
$attrs
);
+
+ // The jobs set a request ID unconditionally, so we should
reuse that one
+ $event['meta']['request_id'] = $event['params']['requestId'];
+
+ return $event;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/376574
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice5b99b28d28801e45722e86efd3e77fce7ecaa3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: master
Gerrit-Owner: Ppchelko <ppche...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
