jenkins-bot has submitted this change and it was merged.

Change subject: Jobs fail instead of throwing error when score is not right
......................................................................


Jobs fail instead of throwing error when score is not right

Bug: T141978
Change-Id: I17a71b8d02845ae7dc3f29643512ac5e855a7d5b
---
M includes/FetchScoreJob.php
1 file changed, 13 insertions(+), 5 deletions(-)

Approvals:
  Ladsgroup: Looks good to me, approved
  Daniel Kinzler: Looks good to me, but someone else must approve
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/FetchScoreJob.php b/includes/FetchScoreJob.php
index 7cfa446..c61719f 100644
--- a/includes/FetchScoreJob.php
+++ b/includes/FetchScoreJob.php
@@ -20,10 +20,18 @@
                $logger->info( 'Fetching scores for revision ' . json_encode( 
$this->params ) );
                $scores = Scoring::instance()->getScores(
                        $this->params['revid'], null, 
$this->params['extra_params'] );
-               Cache::instance()->storeScores( $scores );
-               $logger->debug( 'Stored scores: ' . json_encode( $scores ) );
-
-               // FIXME: Or should we return false on error, set the error 
string, etc?
-               return true;
+               $cache = Cache::instance();
+               $status = null;
+               $cache->setErrorCallback( function ( $mssg, $revision ) use ( 
&$status, &$logger ) {
+                       $logger->warning( "Scoring errored for $revision: 
$mssg\n" );
+                       $status = false;
+               } );
+               $cache->storeScores( $scores );
+               if ( $status === false ) {
+                       return false;
+               } else {
+                       $logger->debug( 'Stored scores: ' . json_encode( 
$scores ) );
+                       return true;
+               }
        }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/302703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I17a71b8d02845ae7dc3f29643512ac5e855a7d5b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to