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 "Introduce InterwikiLookupAdapter on top of SiteLookup"
[lhc/web/wiklou.git]
/
includes
/
jobqueue
/
JobRunner.php
diff --git
a/includes/jobqueue/JobRunner.php
b/includes/jobqueue/JobRunner.php
index
022abd9
..
0469eeb
100644
(file)
--- a/
includes/jobqueue/JobRunner.php
+++ b/
includes/jobqueue/JobRunner.php
@@
-26,6
+26,7
@@
use MediaWiki\Logger\LoggerFactory;
use Liuggio\StatsdClient\Factory\StatsdDataFactory;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerInterface;
use Liuggio\StatsdClient\Factory\StatsdDataFactory;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerInterface;
+use Wikimedia\ScopedCallback;
/**
* Job queue runner utility methods
/**
* Job queue runner utility methods
@@
-280,11
+281,10
@@
class JobRunner implements LoggerAwareInterface {
MWExceptionHandler::rollbackMasterChangesAndLog( $e );
$status = false;
$error = get_class( $e ) . ': ' . $e->getMessage();
MWExceptionHandler::rollbackMasterChangesAndLog( $e );
$status = false;
$error = get_class( $e ) . ': ' . $e->getMessage();
- MWExceptionHandler::logException( $e );
}
// Always attempt to call teardown() even if Job throws exception.
try {
}
// Always attempt to call teardown() even if Job throws exception.
try {
- $job->teardown();
+ $job->teardown(
$status
);
} catch ( Exception $e ) {
MWExceptionHandler::logException( $e );
}
} catch ( Exception $e ) {
MWExceptionHandler::logException( $e );
}