[MediaWiki-commits] [Gerrit] Handle exceptions in stomp job runner - change (wikimedia...SmashPig)

2015-11-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Handle exceptions in stomp job runner
..


Handle exceptions in stomp job runner

Change-Id: Ic070fa7cbf348feb27d28021f081b81584a5ed56
---
M Maintenance/StompJobRunner.php
1 file changed, 11 insertions(+), 2 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Maintenance/StompJobRunner.php b/Maintenance/StompJobRunner.php
index 916d595..f22a5b8 100644
--- a/Maintenance/StompJobRunner.php
+++ b/Maintenance/StompJobRunner.php
@@ -45,11 +45,20 @@
}
 
if ( $jobObj instanceof \SmashPig\Core\Jobs\RunnableJob 
) {
-   if ( $jobObj->execute() ) {
+   $success = false;
+   try {
+   if ( $jobObj->execute() ) {
+   $success = true;
+   } else {
+   Logger::info( "Job tells us 
that it did not successfully execute. Sending to damaged message queue.", 
$jobObj );
+   }
+   } catch ( SmashPigException $ex ) {
+   Logger::info( "Job threw exception 
{$ex->getMessage()}. Sending to damaged message queue.", $jobObj );
+   }
+   if ( $success ) {
$successCount += 1;
$this->datastore->queueAckObject();
} else {
-   Logger::info( "Job tells us that it did 
not successfully execute. Sending to damaged message queue.", $jobObj );

$this->damagedDatastore->queueAddObject( $jobObj );
$this->datastore->queueAckObject();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic070fa7cbf348feb27d28021f081b81584a5ed56
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Handle exceptions in stomp job runner - change (wikimedia...SmashPig)

2015-11-07 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251726

Change subject: Handle exceptions in stomp job runner
..

Handle exceptions in stomp job runner

Change-Id: Ic070fa7cbf348feb27d28021f081b81584a5ed56
---
M Maintenance/StompJobRunner.php
1 file changed, 11 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/26/251726/1

diff --git a/Maintenance/StompJobRunner.php b/Maintenance/StompJobRunner.php
index 916d595..f22a5b8 100644
--- a/Maintenance/StompJobRunner.php
+++ b/Maintenance/StompJobRunner.php
@@ -45,11 +45,20 @@
}
 
if ( $jobObj instanceof \SmashPig\Core\Jobs\RunnableJob 
) {
-   if ( $jobObj->execute() ) {
+   $success = false;
+   try {
+   if ( $jobObj->execute() ) {
+   $success = true;
+   } else {
+   Logger::info( "Job tells us 
that it did not successfully execute. Sending to damaged message queue.", 
$jobObj );
+   }
+   } catch ( SmashPigException $ex ) {
+   Logger::info( "Job threw exception 
{$ex->getMessage()}. Sending to damaged message queue.", $jobObj );
+   }
+   if ( $success ) {
$successCount += 1;
$this->datastore->queueAckObject();
} else {
-   Logger::info( "Job tells us that it did 
not successfully execute. Sending to damaged message queue.", $jobObj );

$this->damagedDatastore->queueAddObject( $jobObj );
$this->datastore->queueAckObject();
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic070fa7cbf348feb27d28021f081b81584a5ed56
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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