1 files changed, 21 insertions, 13 deletions

diff --git a/maintenance/cleanupUploadStash.php b/maintenance/cleanupUploadStash.php
index 1926c05a..5f57ffdf 100644
--- a/maintenance/cleanupUploadStash.php
+++ b/maintenance/cleanupUploadStash.php
@@ -32,44 +32,52 @@ class UploadStashCleanup extends Maintenance {
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "Clean up abandoned files in temporary uploaded file stash";
-  	}
+	}
 
-  	public function execute() {
+	public function execute() {
 		$repo = RepoGroup::singleton()->getLocalRepo();
-	
+
 		$dbr = $repo->getSlaveDb();
-		
+
+		// how far back should this look for files to delete?
+		global $wgUploadStashMaxAge;
+
 		$this->output( "Getting list of files to clean up...\n" );
 		$res = $dbr->select(
 			'uploadstash',
 			'us_key',
-			'us_timestamp < ' . $dbr->addQuotes( $dbr->timestamp( time() - UploadStash::REPO_AGE * 3600 ) ),
+			'us_timestamp < ' . $dbr->addQuotes( $dbr->timestamp( time() - $wgUploadStashMaxAge ) ),
 			__METHOD__
 		);
-		
+
 		if( !is_object( $res ) || $res->numRows() == 0 ) {
+			$this->output( "No files to cleanup!\n" );
 			// nothing to do.
-			return false;
+			return;
 		}
 
 		// finish the read before starting writes.
 		$keys = array();
-		foreach($res as $row) {
+		foreach( $res as $row ) {
 			array_push( $keys, $row->us_key );
 		}
-		
+
 		$this->output( 'Removing ' . count($keys) . " file(s)...\n" );
 		// this could be done some other, more direct/efficient way, but using
 		// UploadStash's own methods means it's less likely to fall accidentally
 		// out-of-date someday
 		$stash = new UploadStash( $repo );
-		
+
 		foreach( $keys as $key ) {
-			$stash->getFile( $key, true );
-			$stash->removeFileNoAuth( $key );
+			try {
+				$stash->getFile( $key, true );
+				$stash->removeFileNoAuth( $key );
+			} catch ( UploadStashBadPathException $ex ) {
+				$this->output( "Failed removing stashed upload with key: $key\n"  );
+			}
 		}
   	}
 }
 
 $maintClass = "UploadStashCleanup";
-require_once( RUN_MAINTENANCE_IF_MAIN );
\ No newline at end of file
+require_once( RUN_MAINTENANCE_IF_MAIN );