| Index: trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php |
| — | — | @@ -111,7 +111,9 @@ |
| 112 | 112 | if ( $res === 'cantacquire' ) { |
| 113 | 113 | // Resources already locked by another process. |
| 114 | 114 | // Abort and unlock everything we just locked. |
| 115 | | - $status->fatal( 'lockmanager-fail-acquirelocks', implode( ', ', $paths ) ); |
| | 115 | + foreach ( $paths as $path ) { |
| | 116 | + $status->fatal( 'lockmanager-fail-acquirelock', $path ); |
| | 117 | + } |
| 116 | 118 | $status->merge( $this->doUnlock( $lockedPaths, $type ) ); |
| 117 | 119 | return $status; |
| 118 | 120 | } elseif ( $res !== true ) { |
| Index: trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php |
| — | — | @@ -88,13 +88,17 @@ |
| 89 | 89 | if ( $res === 'cantacquire' ) { |
| 90 | 90 | // Resources already locked by another process. |
| 91 | 91 | // Abort and unlock everything we just locked. |
| 92 | | - $status->fatal( 'lockmanager-fail-acquirelocks', implode( ', ', $paths ) ); |
| | 92 | + foreach ( $paths as $path ) { |
| | 93 | + $status->fatal( 'lockmanager-fail-acquirelock', $path ); |
| | 94 | + } |
| 93 | 95 | $status->merge( $this->doUnlock( $lockedPaths, $type ) ); |
| 94 | 96 | return $status; |
| 95 | 97 | } elseif ( $res !== true ) { |
| 96 | 98 | // Couldn't contact any servers for this bucket. |
| 97 | 99 | // Abort and unlock everything we just locked. |
| 98 | | - $status->fatal( 'lockmanager-fail-acquirelocks', implode( ', ', $paths ) ); |
| | 100 | + foreach ( $paths as $path ) { |
| | 101 | + $status->fatal( 'lockmanager-fail-acquirelock', $path ); |
| | 102 | + } |
| 99 | 103 | $status->merge( $this->doUnlock( $lockedPaths, $type ) ); |
| 100 | 104 | return $status; |
| 101 | 105 | } |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -1903,19 +1903,17 @@ |
| 1904 | 1904 | |
| 1905 | 1905 | # Lock manager |
| 1906 | 1906 | 'lockmanager-notlocked' => 'Parameters: |
| 1907 | | -* $1 is a key name.', |
| | 1907 | +* $1 is a resource path (e.g. "mwstore://media-public/a/ab/file.jpg").', |
| 1908 | 1908 | 'lockmanager-fail-closelock' => 'Parameters: |
| 1909 | | -* $1 is a key name.', |
| | 1909 | +* $1 is a resource path (e.g. "mwstore://media-public/a/ab/file.jpg").', |
| 1910 | 1910 | 'lockmanager-fail-deletelock' => 'Parameters: |
| 1911 | | -* $1 is a key name.', |
| | 1911 | +* $1 is a resource path (e.g. "mwstore://media-public/a/ab/file.jpg").', |
| 1912 | 1912 | 'lockmanager-fail-acquirelock' => 'Parameters: |
| 1913 | | -* $1 is a key name.', |
| | 1913 | +* $1 is a resource path (e.g. "mwstore://media-public/a/ab/file.jpg").', |
| 1914 | 1914 | 'lockmanager-fail-openlock' => 'Parameters: |
| 1915 | | -* $1 is a key name.', |
| | 1915 | +* $1 is a resource path (e.g. "mwstore://media-public/a/ab/file.jpg").', |
| 1916 | 1916 | 'lockmanager-fail-releaselock' => 'Parameters: |
| 1917 | | -* $1 is a key name.', |
| 1918 | | -'lockmanager-fail-acquirelocks' => 'Parameters: |
| 1919 | | -* $1 is a list of key names.', |
| | 1917 | +* $1 is a resource path (e.g. "mwstore://media-public/a/ab/file.jpg").', |
| 1920 | 1918 | 'lockmanager-fail-db-bucket' => 'Parameters: |
| 1921 | 1919 | * $1 is a bucket name.', |
| 1922 | 1920 | 'lockmanager-fail-db-release' => 'Parameters: |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2254,13 +2254,12 @@ |
| 2255 | 2255 | 'backend-fail-create' => 'Could not create file $1.', |
| 2256 | 2256 | |
| 2257 | 2257 | # Lock manager |
| 2258 | | -'lockmanager-notlocked' => 'Could not unlock hash key "$1"; it is not locked.', |
| 2259 | | -'lockmanager-fail-closelock' => 'Could not close lock file for hash key "$1".', |
| 2260 | | -'lockmanager-fail-deletelock' => 'Could not delete lock file for hash key "$1".', |
| 2261 | | -'lockmanager-fail-acquirelock' => 'Could not acquire lock for hash key "$1".', |
| 2262 | | -'lockmanager-fail-openlock' => 'Could not open lock file for hash key "$1".', |
| 2263 | | -'lockmanager-fail-releaselock' => 'Could not release lock for hash key "$1".', |
| 2264 | | -'lockmanager-fail-acquirelocks' => 'Could not acquire locks for hash keys "$1".', |
| | 2258 | +'lockmanager-notlocked' => 'Could not unlock "$1"; it is not locked.', |
| | 2259 | +'lockmanager-fail-closelock' => 'Could not close lock file for "$1".', |
| | 2260 | +'lockmanager-fail-deletelock' => 'Could not delete lock file for "$1".', |
| | 2261 | +'lockmanager-fail-acquirelock' => 'Could not acquire lock for "$1".', |
| | 2262 | +'lockmanager-fail-openlock' => 'Could not open lock file for "$1".', |
| | 2263 | +'lockmanager-fail-releaselock' => 'Could not release lock for "$1".', |
| 2265 | 2264 | 'lockmanager-fail-db-bucket' => 'Could not contact enough lock databases in bucket $1.', |
| 2266 | 2265 | 'lockmanager-fail-db-release' => 'Could not release locks on database $1.', |
| 2267 | 2266 | 'lockmanager-fail-svr-release' => 'Could not release locks on server $1.', |