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

Merge "upload: switch AssembleUploadChunksJob to GenericParameterJob"

Browse source
This commit is contained in:
jenkins-bot 2024-03-03 09:30:51 +00:00 committed by Gerrit Code Review
commit e78541e80f
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
includes/api/ApiUpload.php
View file

@ -25,7 +25,6 @@ use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Status\Status;
use MediaWiki\Title\Title;
use MediaWiki\User\Options\UserOptionsLookup;
use MediaWiki\User\User;
use MediaWiki\Watchlist\WatchlistManager;
@ -400,15 +399,12 @@ class ApiUpload extends ApiBase {
// into job queue until after the current transaction has completed since
// this depends on values in uploadstash table that were updated during
// the current transaction. (T350917)
$this->jobQueueGroup->lazyPush( new AssembleUploadChunksJob(
Title::makeTitle( NS_FILE, $filekey ),
[
'filename' => $this->mParams['filename'],
'filekey' => $filekey,
'filesize' => $this->mParams['filesize'],
'session' => $this->getContext()->exportSession()
]
) );
$this->jobQueueGroup->lazyPush( new AssembleUploadChunksJob( [
'filename' => $this->mParams['filename'],
'filekey' => $filekey,
'filesize' => $this->mParams['filesize'],
'session' => $this->getContext()->exportSession()
] ) );
$this->log->info( "Received final chunk of {filename} for {user}, queuing assemble job",
[
'user' => $this->getUser()->getName(),

7
includes/jobqueue/jobs/AssembleUploadChunksJob.php
View file

@ -22,7 +22,6 @@ use MediaWiki\Context\RequestContext;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\Request\WebRequestUpload;
use MediaWiki\Status\Status;
use MediaWiki\Title\Title;
use Wikimedia\ScopedCallback;
/**
@ -31,9 +30,9 @@ use Wikimedia\ScopedCallback;
* @ingroup Upload
* @ingroup JobQueue
*/
class AssembleUploadChunksJob extends Job {
public function __construct( Title $title, array $params ) {
parent::__construct( 'AssembleUploadChunks', $title, $params );
class AssembleUploadChunksJob extends Job implements GenericParameterJob {
public function __construct( array $params ) {
parent::__construct( 'AssembleUploadChunks', $params );
$this->removeDuplicates = true;
}