From dd591578285123fb07f3bb2a5cfa4c64fc397326 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 14 Mar 2013 11:42:26 -0700
Subject: [PATCH] Cleaned up upload job error reporting.

Change-Id: I2379d235eb9fed58412c9fefb9cabe56868395b9
---
 includes/job/jobs/AssembleUploadChunksJob.php | 14 ++++++++------
 includes/job/jobs/PublishStashedFileJob.php   | 16 +++++++++-------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/includes/job/jobs/AssembleUploadChunksJob.php b/includes/job/jobs/AssembleUploadChunksJob.php
index 840a3985f8..f243b0c388 100644
--- a/includes/job/jobs/AssembleUploadChunksJob.php
+++ b/includes/job/jobs/AssembleUploadChunksJob.php
@@ -39,7 +39,7 @@ class AssembleUploadChunksJob extends Job {
 			$user = $context->getUser();
 			if ( !$user->isLoggedIn() || $user->getId() != $this->params['userid'] ) {
 				$this->setLastError( "Could not load the author user from session." );
-				return true; // no retries
+				return false;
 			}
 
 			UploadBase::setSessionStatus(
@@ -62,7 +62,7 @@ class AssembleUploadChunksJob extends Job {
 					array( 'result' => 'Failure', 'stage' => 'assembling', 'status' => $status )
 				);
 				$this->setLastError( $status->getWikiText() );
-				return true; // no retries
+				return false;
 			}
 
 			// We have a new filekey for the fully concatenated file
@@ -99,13 +99,11 @@ class AssembleUploadChunksJob extends Job {
 				)
 			);
 			$this->setLastError( get_class( $e ) . ": " . $e->getText() );
+			return false;
 		}
-		return true; // returns true on success and erro (no retries)
+		return true;
 	}
 
-	/**
-	 * @return Array
-	 */
 	public function getDeduplicationInfo() {
 		$info = parent::getDeduplicationInfo();
 		if ( is_array( $info['params'] ) ) {
@@ -113,4 +111,8 @@ class AssembleUploadChunksJob extends Job {
 		}
 		return $info;
 	}
+
+	public function allowRetries() {
+		return false;
+	}
 }
diff --git a/includes/job/jobs/PublishStashedFileJob.php b/includes/job/jobs/PublishStashedFileJob.php
index 594d30493b..87dffc99ae 100644
--- a/includes/job/jobs/PublishStashedFileJob.php
+++ b/includes/job/jobs/PublishStashedFileJob.php
@@ -39,7 +39,7 @@ class PublishStashedFileJob extends Job {
 			$user = $context->getUser();
 			if ( !$user->isLoggedIn() || $user->getId() != $this->params['userid'] ) {
 				$this->setLastError( "Could not load the author user from session." );
-				return true; // no retries
+				return false;
 			}
 
 			UploadBase::setSessionStatus(
@@ -64,7 +64,7 @@ class PublishStashedFileJob extends Job {
 					array( 'result' => 'Failure', 'stage' => 'publish', 'status' => $status )
 				);
 				$this->setLastError( "Could not verify upload." );
-				return true; // no retries
+				return false;
 			}
 
 			// Upload the stashed file to a permanent location
@@ -80,7 +80,7 @@ class PublishStashedFileJob extends Job {
 					array( 'result' => 'Failure', 'stage' => 'publish', 'status' => $status )
 				);
 				$this->setLastError( $status->getWikiText() );
-				return true; // no retries
+				return false;
 			}
 
 			// Build the image info array while we have the local reference handy
@@ -111,13 +111,11 @@ class PublishStashedFileJob extends Job {
 				)
 			);
 			$this->setLastError( get_class( $e ) . ": " . $e->getText() );
+			return false;
 		}
-		return true; // returns true on success and erro (no retries)
+		return true;
 	}
 
-	/**
-	 * @return Array
-	 */
 	public function getDeduplicationInfo() {
 		$info = parent::getDeduplicationInfo();
 		if ( is_array( $info['params'] ) ) {
@@ -125,4 +123,8 @@ class PublishStashedFileJob extends Job {
 		}
 		return $info;
 	}
+
+	public function allowRetries() {
+		return false;
+	}
 }
-- 
2.20.1