w/s

[lhc/web/wiklou.git] / maintenance / cleanupUploadStash.php

diff --git a/maintenance/cleanupUploadStash.php b/maintenance/cleanupUploadStash.php
index 763f556..788f0f5 100644 (file)
--- a/maintenance/cleanupUploadStash.php
+++ b/maintenance/cleanupUploadStash.php
@@ -35,34 +35,39 @@ class UploadStashCleanup extends Maintenance {
        }
 
        public function execute() {
-               $dbr = wfGetDB( DB_SLAVE );
-               
+               $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 < ' . wfTimestamp( TS_MW, time() - UploadStash::REPO_AGE * 3600 ),
+                       'us_timestamp < ' . $dbr->addQuotes( $dbr->timestamp( time() - $wgUploadStashMaxAge ) ),
                        __METHOD__
                );
-               
-               if( !is_object( $res ) ) {
+
+               if( !is_object( $res ) || $res->numRows() == 0 ) {
+                       $this->output( 'No files to cleanup!' );
                        // nothing to do.
-                       return false;
+                       return;
                }
 
                // finish the read before starting writes.
                $keys = array();
-               while( $row = $dbr->fetchRow( $res ) ) {
-                       array_push( $keys, $row['us_key'] );
+               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
-               $repo = RepoGroup::singleton()->getLocalRepo();
                $stash = new UploadStash( $repo );
-               
+
                foreach( $keys as $key ) {
                        $stash->getFile( $key, true );
                        $stash->removeFileNoAuth( $key );
@@ -71,4 +76,4 @@ class UploadStashCleanup extends Maintenance {
 }
 
 $maintClass = "UploadStashCleanup";
-require_once( RUN_MAINTENANCE_IF_MAIN );
\ No newline at end of file
+require_once( RUN_MAINTENANCE_IF_MAIN );