Add __METHOD__ to begin/commit

Improve error message from r109433

diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php
index 19114ab..aca2c5b 100644 (file)
--- a/includes/upload/UploadStash.php
+++ b/includes/upload/UploadStash.php
@@ -331,13 +331,13 @@ class UploadStash {
                $dbw = $this->repo->getMasterDb();
 
                // this gets its own transaction since it's called serially by the cleanupUploadStash maintenance script
-               $dbw->begin();
+               $dbw->begin( __METHOD__ );
                $dbw->delete(
                        'uploadstash',
                        array( 'us_key' => $key ),
                        __METHOD__
                );
-               $dbw->commit();
+               $dbw->commit( __METHOD__ );
 
                // TODO: look into UnregisteredLocalFile and find out why the rv here is sometimes wrong (false when file was removed)
                // for now, ignore.

diff --git a/maintenance/cleanupUploadStash.php b/maintenance/cleanupUploadStash.php
index e46b853..098a4b4 100644 (file)
--- a/maintenance/cleanupUploadStash.php
+++ b/maintenance/cleanupUploadStash.php
@@ -73,7 +73,7 @@ class UploadStashCleanup extends Maintenance {
                                $stash->getFile( $key, true );
                                $stash->removeFileNoAuth( $key );
                        } catch ( UploadStashBadPathException $ex ) {
-                               $this->output( 'Failed removing stashed upload with key:' . $key );
+                               $this->output( "Failed removing stashed upload with key: $key\n"  );
                                continue;
                        }
                }