dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "filebackend: clean up some comments and remove unused FileBackendStoreOpHandle...
[lhc/web/wiklou.git]
/
includes
/
jobqueue
/
JobQueueMemory.php
diff --git
a/includes/jobqueue/JobQueueMemory.php
b/includes/jobqueue/JobQueueMemory.php
index
cbcd4fb
..
b26129e
100644
(file)
--- a/
includes/jobqueue/JobQueueMemory.php
+++ b/
includes/jobqueue/JobQueueMemory.php
@@
-33,9
+33,9
@@
class JobQueueMemory extends JobQueue {
protected static $data = [];
public function __construct( array $params ) {
protected static $data = [];
public function __construct( array $params ) {
-
parent::__construct( $params
);
+
$params['wanCache'] = new WANObjectCache( [ 'cache' => new HashBagOStuff() ]
);
-
$this->dupCache = new HashBagOStuff(
);
+
parent::__construct( $params
);
}
/**
}
/**
@@
-111,7
+111,7
@@
class JobQueueMemory extends JobQueue {
/**
* @see JobQueue::doPop
*
/**
* @see JobQueue::doPop
*
- * @return Job|bool
+ * @return
Runnable
Job|bool
*/
protected function doPop() {
if ( $this->doGetSize() == 0 ) {
*/
protected function doPop() {
if ( $this->doGetSize() == 0 ) {
@@
-143,9
+143,9
@@
class JobQueueMemory extends JobQueue {
/**
* @see JobQueue::doAck
*
/**
* @see JobQueue::doAck
*
- * @param Job $job
+ * @param
Runnable
Job $job
*/
*/
- protected function doAck( Job $job ) {
+ protected function doAck(
Runnable
Job $job ) {
if ( $this->getAcquiredCount() == 0 ) {
return;
}
if ( $this->getAcquiredCount() == 0 ) {
return;
}
@@
-206,11
+206,10
@@
class JobQueueMemory extends JobQueue {
/**
* @param IJobSpecification $spec
/**
* @param IJobSpecification $spec
- *
- * @return Job
+ * @return RunnableJob
*/
public function jobFromSpecInternal( IJobSpecification $spec ) {
*/
public function jobFromSpecInternal( IJobSpecification $spec ) {
- return
Job::factory( $spec->getType(), $spec->getTitl
e(), $spec->getParams() );
+ return
$this->factoryJob( $spec->getTyp
e(), $spec->getParams() );
}
/**
}
/**