Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace deprecated JobQueueGroup::singleton in JobQueueEnqueueUpdate

Browse source 
Fix documentation and type hint in JobQueueEnqueueUpdate

Change-Id: I68487d0c44ed4f3064455f79f36ce896e8eff143
This commit is contained in:
Umherirrender 2021-08-19 21:46:52 +02:00 committed by Reedy
parent 8a5bc391aa
commit b1e1a11ca6
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
includes/deferred/JobQueueEnqueueUpdate.php
View file

@ -20,6 +20,8 @@
* @file
*/
use MediaWiki\JobQueue\JobQueueGroupFactory;
use MediaWiki\MediaWikiServices;
use Wikimedia\Assert\Assert;
/**
@ -29,34 +31,43 @@ use Wikimedia\Assert\Assert;
* @since 1.33
*/
class JobQueueEnqueueUpdate implements DeferrableUpdate, MergeableUpdate {
/** @var array[] Map of (domain ID => IJobSpecification[]) */
/** @var IJobSpecification[][] */
private $jobsByDomain;
/** @var JobQueueGroupFactory */
private $jobQueueGroupFactory;
/**
* @param string $domain DB domain ID
* @param IJobSpecification[] $jobs
*/
public function __construct( $domain, array $jobs ) {
public function __construct( string $domain, array $jobs ) {
$this->jobsByDomain[$domain] = $jobs;
// TODO Inject services, when DeferredUpdates supports DI
$this->jobQueueGroupFactory = MediaWikiServices::getInstance()->getJobQueueGroupFactory();
}
/** @inheritDoc */
public function merge( MergeableUpdate $update ) {
/** @var self $update */
Assert::parameterType( __CLASS__, $update, '$update' );
'@phan-var self $update';
foreach ( $update->jobsByDomain as $domain => $jobs ) {
$this->jobsByDomain[$domain] = $this->jobsByDomain[$domain] ?? [];
$this->jobsByDomain[$domain] = array_merge( $this->jobsByDomain[$domain], $jobs );
$this->jobsByDomain[$domain] = array_merge(
$this->jobsByDomain[$domain] ?? [],
$jobs
);
}
}
/** @inheritDoc */
public function doUpdate() {
foreach ( $this->jobsByDomain as $domain => $jobs ) {
$group = JobQueueGroup::singleton( $domain );
$group = $this->jobQueueGroupFactory->makeJobQueueGroup( $domain );
try {
$group->push( $jobs );
} catch ( Exception $e ) {
} catch ( Throwable $e ) {
// Get in as many jobs as possible and let other post-send updates happen
MWExceptionHandler::logException( $e );
}