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
Bump and prep 1.31.6
[lhc/web/wiklou.git]
/
includes
/
jobqueue
/
JobRunner.php
diff --git
a/includes/jobqueue/JobRunner.php
b/includes/jobqueue/JobRunner.php
index
fa7d605
..
977fbda
100644
(file)
--- a/
includes/jobqueue/JobRunner.php
+++ b/
includes/jobqueue/JobRunner.php
@@
-290,7
+290,9
@@
class JobRunner implements LoggerAwareInterface {
$jobStartTime = microtime( true );
try {
$fnameTrxOwner = get_class( $job ) . '::run'; // give run() outer scope
$jobStartTime = microtime( true );
try {
$fnameTrxOwner = get_class( $job ) . '::run'; // give run() outer scope
- $lbFactory->beginMasterChanges( $fnameTrxOwner );
+ if ( !$job->hasExecutionFlag( $job::JOB_NO_EXPLICIT_TRX_ROUND ) ) {
+ $lbFactory->beginMasterChanges( $fnameTrxOwner );
+ }
$status = $job->run();
$error = $job->getLastError();
$this->commitMasterChanges( $lbFactory, $job, $fnameTrxOwner );
$status = $job->run();
$error = $job->getLastError();
$this->commitMasterChanges( $lbFactory, $job, $fnameTrxOwner );