| Index: trunk/phase3/includes/filerepo/backend/SwiftFileBackend.php |
| — | — | @@ -11,11 +11,10 @@ |
| 12 | 12 | * Status messages should avoid mentioning the Swift account name |
| 13 | 13 | * Likewise, error suppression should be used to avoid path disclosure. |
| 14 | 14 | * |
| 15 | | - * This requires the php-cloudfiles library is present, |
| | 15 | + * This requires that the php-cloudfiles library is present, |
| 16 | 16 | * which is available at https://github.com/rackspace/php-cloudfiles. |
| 17 | 17 | * All of the library classes must be registed in $wgAutoloadClasses. |
| 18 | 18 | * |
| 19 | | - * @TODO: update MessagesEn for status errors. |
| 20 | 19 | * @TODO: handle 'latest' param as "X-Newest: true". |
| 21 | 20 | * |
| 22 | 21 | * @ingroup FileBackend |
| — | — | @@ -95,7 +94,7 @@ |
| 96 | 95 | $status->fatal( 'backend-fail-connect', $this->name ); |
| 97 | 96 | return $status; |
| 98 | 97 | } catch ( Exception $e ) { // some other exception? |
| 99 | | - $status->fatal( 'backend-fail-internal' ); |
| | 98 | + $status->fatal( 'backend-fail-internal', $this->name ); |
| 100 | 99 | $this->logException( $e, __METHOD__, $params ); |
| 101 | 100 | return $status; |
| 102 | 101 | } |
| — | — | @@ -114,7 +113,7 @@ |
| 115 | 114 | $status->fatal( 'backend-fail-connect', $this->name ); |
| 116 | 115 | return $status; |
| 117 | 116 | } catch ( Exception $e ) { // some other exception? |
| 118 | | - $status->fatal( 'backend-fail-internal' ); |
| | 117 | + $status->fatal( 'backend-fail-internal', $this->name ); |
| 119 | 118 | $this->logException( $e, __METHOD__, $params ); |
| 120 | 119 | return $status; |
| 121 | 120 | } |
| — | — | @@ -133,7 +132,7 @@ |
| 134 | 133 | } catch ( InvalidResponseException $e ) { |
| 135 | 134 | $status->fatal( 'backend-fail-connect', $this->name ); |
| 136 | 135 | } catch ( Exception $e ) { // some other exception? |
| 137 | | - $status->fatal( 'backend-fail-internal' ); |
| | 136 | + $status->fatal( 'backend-fail-internal', $this->name ); |
| 138 | 137 | $this->logException( $e, __METHOD__, $params ); |
| 139 | 138 | } |
| 140 | 139 | |
| — | — | @@ -169,7 +168,7 @@ |
| 170 | 169 | $status->fatal( 'backend-fail-connect', $this->name ); |
| 171 | 170 | return $status; |
| 172 | 171 | } catch ( Exception $e ) { // some other exception? |
| 173 | | - $status->fatal( 'backend-fail-internal' ); |
| | 172 | + $status->fatal( 'backend-fail-internal', $this->name ); |
| 174 | 173 | $this->logException( $e, __METHOD__, $params ); |
| 175 | 174 | return $status; |
| 176 | 175 | } |
| — | — | @@ -188,7 +187,7 @@ |
| 189 | 188 | $status->fatal( 'backend-fail-connect', $this->name ); |
| 190 | 189 | return $status; |
| 191 | 190 | } catch ( Exception $e ) { // some other exception? |
| 192 | | - $status->fatal( 'backend-fail-internal' ); |
| | 191 | + $status->fatal( 'backend-fail-internal', $this->name ); |
| 193 | 192 | $this->logException( $e, __METHOD__, $params ); |
| 194 | 193 | return $status; |
| 195 | 194 | } |
| — | — | @@ -214,7 +213,7 @@ |
| 215 | 214 | } catch ( InvalidResponseException $e ) { |
| 216 | 215 | $status->fatal( 'backend-fail-connect', $this->name ); |
| 217 | 216 | } catch ( Exception $e ) { // some other exception? |
| 218 | | - $status->fatal( 'backend-fail-internal' ); |
| | 217 | + $status->fatal( 'backend-fail-internal', $this->name ); |
| 219 | 218 | $this->logException( $e, __METHOD__, $params ); |
| 220 | 219 | } |
| 221 | 220 | |
| — | — | @@ -257,7 +256,7 @@ |
| 258 | 257 | $status->fatal( 'backend-fail-connect', $this->name ); |
| 259 | 258 | return $status; |
| 260 | 259 | } catch ( Exception $e ) { // some other exception? |
| 261 | | - $status->fatal( 'backend-fail-internal' ); |
| | 260 | + $status->fatal( 'backend-fail-internal', $this->name ); |
| 262 | 261 | $this->logException( $e, __METHOD__, $params ); |
| 263 | 262 | return $status; |
| 264 | 263 | } |
| — | — | @@ -276,7 +275,7 @@ |
| 277 | 276 | $status->fatal( 'backend-fail-connect', $this->name ); |
| 278 | 277 | return $status; |
| 279 | 278 | } catch ( Exception $e ) { // some other exception? |
| 280 | | - $status->fatal( 'backend-fail-internal' ); |
| | 279 | + $status->fatal( 'backend-fail-internal', $this->name ); |
| 281 | 280 | $this->logException( $e, __METHOD__, $params ); |
| 282 | 281 | return $status; |
| 283 | 282 | } |
| — | — | @@ -289,7 +288,7 @@ |
| 290 | 289 | } catch ( InvalidResponseException $e ) { |
| 291 | 290 | $status->fatal( 'backend-fail-connect', $this->name ); |
| 292 | 291 | } catch ( Exception $e ) { // some other exception? |
| 293 | | - $status->fatal( 'backend-fail-internal' ); |
| | 292 | + $status->fatal( 'backend-fail-internal', $this->name ); |
| 294 | 293 | $this->logException( $e, __METHOD__, $params ); |
| 295 | 294 | } |
| 296 | 295 | |
| — | — | @@ -325,7 +324,7 @@ |
| 326 | 325 | $status->fatal( 'backend-fail-connect', $this->name ); |
| 327 | 326 | return $status; |
| 328 | 327 | } catch ( Exception $e ) { // some other exception? |
| 329 | | - $status->fatal( 'backend-fail-internal' ); |
| | 328 | + $status->fatal( 'backend-fail-internal', $this->name ); |
| 330 | 329 | $this->logException( $e, __METHOD__, $params ); |
| 331 | 330 | return $status; |
| 332 | 331 | } |
| — | — | @@ -340,7 +339,7 @@ |
| 341 | 340 | } catch ( InvalidResponseException $e ) { |
| 342 | 341 | $status->fatal( 'backend-fail-connect', $this->name ); |
| 343 | 342 | } catch ( Exception $e ) { // some other exception? |
| 344 | | - $status->fatal( 'backend-fail-internal' ); |
| | 343 | + $status->fatal( 'backend-fail-internal', $this->name ); |
| 345 | 344 | $this->logException( $e, __METHOD__, $params ); |
| 346 | 345 | } |
| 347 | 346 | |
| — | — | @@ -366,7 +365,7 @@ |
| 367 | 366 | } catch ( InvalidResponseException $e ) { |
| 368 | 367 | $status->fatal( 'backend-fail-connect', $this->name ); |
| 369 | 368 | } catch ( Exception $e ) { // some other exception? |
| 370 | | - $status->fatal( 'backend-fail-internal' ); |
| | 369 | + $status->fatal( 'backend-fail-internal', $this->name ); |
| 371 | 370 | $this->logException( $e, __METHOD__, $params ); |
| 372 | 371 | } |
| 373 | 372 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2256,7 +2256,7 @@ |
| 2257 | 2257 | 'backend-fail-readonly' => 'The backend "$1" is currently read-only. The reason given is: "$2"', |
| 2258 | 2258 | 'backend-fail-synced' => 'The file "$1" is in an inconsistent state within the internal backends', |
| 2259 | 2259 | 'backend-fail-connect' => 'Could not connect to file backend "$1".', |
| 2260 | | -'backend-fail-internal' => 'An unknown internal file backend error occured.', |
| | 2260 | +'backend-fail-internal' => 'An unknown error occurred in file backend "$1".', |
| 2261 | 2261 | |
| 2262 | 2262 | # Lock manager |
| 2263 | 2263 | 'lockmanager-notlocked' => 'Could not unlock "$1"; it is not locked.', |