| Index: branches/FileBackend/phase3/includes/filerepo/backend/SwiftFileBackend.php |
| — | — | @@ -81,7 +81,7 @@ |
| 82 | 82 | // (a) Get a swift proxy connection |
| 83 | 83 | $conn = $this->getConnection(); |
| 84 | 84 | if ( !$conn ) { |
| 85 | | - $status->fatal( 'backend-fail-connect' ); |
| | 85 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 86 | 86 | return $status; |
| 87 | 87 | } |
| 88 | 88 | |
| — | — | @@ -92,7 +92,7 @@ |
| 93 | 93 | $status->fatal( 'backend-fail-create', $params['dst'] ); |
| 94 | 94 | return $status; |
| 95 | 95 | } catch ( InvalidResponseException $e ) { |
| 96 | | - $status->fatal( 'backend-fail-connect' ); |
| | 96 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 97 | 97 | return $status; |
| 98 | 98 | } catch ( Exception $e ) { // some other exception? |
| 99 | 99 | $status->fatal( 'backend-fail-internal' ); |
| — | — | @@ -111,7 +111,7 @@ |
| 112 | 112 | } catch ( NoSuchObjectException $e ) { |
| 113 | 113 | // NoSuchObjectException thrown: file does not exist |
| 114 | 114 | } catch ( InvalidResponseException $e ) { |
| 115 | | - $status->fatal( 'backend-fail-connect' ); |
| | 115 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 116 | 116 | return $status; |
| 117 | 117 | } catch ( Exception $e ) { // some other exception? |
| 118 | 118 | $status->fatal( 'backend-fail-internal' ); |
| — | — | @@ -131,7 +131,7 @@ |
| 132 | 132 | } catch ( BadContentTypeException $e ) { |
| 133 | 133 | $status->fatal( 'backend-fail-contenttype', $params['dst'] ); |
| 134 | 134 | } catch ( InvalidResponseException $e ) { |
| 135 | | - $status->fatal( 'backend-fail-connect' ); |
| | 135 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 136 | 136 | } catch ( Exception $e ) { // some other exception? |
| 137 | 137 | $status->fatal( 'backend-fail-internal' ); |
| 138 | 138 | $this->logException( $e, __METHOD__, $params ); |
| — | — | @@ -155,7 +155,7 @@ |
| 156 | 156 | // (a) Get a swift proxy connection |
| 157 | 157 | $conn = $this->getConnection(); |
| 158 | 158 | if ( !$conn ) { |
| 159 | | - $status->fatal( 'backend-fail-connect' ); |
| | 159 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 160 | 160 | return $status; |
| 161 | 161 | } |
| 162 | 162 | |
| — | — | @@ -166,7 +166,7 @@ |
| 167 | 167 | $status->fatal( 'backend-fail-copy', $params['src'], $params['dst'] ); |
| 168 | 168 | return $status; |
| 169 | 169 | } catch ( InvalidResponseException $e ) { |
| 170 | | - $status->fatal( 'backend-fail-connect' ); |
| | 170 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 171 | 171 | return $status; |
| 172 | 172 | } catch ( Exception $e ) { // some other exception? |
| 173 | 173 | $status->fatal( 'backend-fail-internal' ); |
| — | — | @@ -185,7 +185,7 @@ |
| 186 | 186 | } catch ( NoSuchObjectException $e ) { |
| 187 | 187 | // NoSuchObjectException thrown: file does not exist |
| 188 | 188 | } catch ( InvalidResponseException $e ) { |
| 189 | | - $status->fatal( 'backend-fail-connect' ); |
| | 189 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 190 | 190 | return $status; |
| 191 | 191 | } catch ( Exception $e ) { // some other exception? |
| 192 | 192 | $status->fatal( 'backend-fail-internal' ); |
| — | — | @@ -212,7 +212,7 @@ |
| 213 | 213 | } catch ( IOException $e ) { |
| 214 | 214 | $status->fatal( 'backend-fail-copy', $params['src'], $params['dst'] ); |
| 215 | 215 | } catch ( InvalidResponseException $e ) { |
| 216 | | - $status->fatal( 'backend-fail-connect' ); |
| | 216 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 217 | 217 | } catch ( Exception $e ) { // some other exception? |
| 218 | 218 | $status->fatal( 'backend-fail-internal' ); |
| 219 | 219 | $this->logException( $e, __METHOD__, $params ); |
| — | — | @@ -242,7 +242,7 @@ |
| 243 | 243 | // (a) Get a swift proxy connection |
| 244 | 244 | $conn = $this->getConnection(); |
| 245 | 245 | if ( !$conn ) { |
| 246 | | - $status->fatal( 'backend-fail-connect' ); |
| | 246 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 247 | 247 | return $status; |
| 248 | 248 | } |
| 249 | 249 | |
| — | — | @@ -254,7 +254,7 @@ |
| 255 | 255 | $status->fatal( 'backend-fail-copy', $params['src'], $params['dst'] ); |
| 256 | 256 | return $status; |
| 257 | 257 | } catch ( InvalidResponseException $e ) { |
| 258 | | - $status->fatal( 'backend-fail-connect' ); |
| | 258 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 259 | 259 | return $status; |
| 260 | 260 | } catch ( Exception $e ) { // some other exception? |
| 261 | 261 | $status->fatal( 'backend-fail-internal' ); |
| — | — | @@ -273,7 +273,7 @@ |
| 274 | 274 | } catch ( NoSuchObjectException $e ) { |
| 275 | 275 | // NoSuchObjectException thrown: file does not exist |
| 276 | 276 | } catch ( InvalidResponseException $e ) { |
| 277 | | - $status->fatal( 'backend-fail-connect' ); |
| | 277 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 278 | 278 | return $status; |
| 279 | 279 | } catch ( Exception $e ) { // some other exception? |
| 280 | 280 | $status->fatal( 'backend-fail-internal' ); |
| — | — | @@ -287,7 +287,7 @@ |
| 288 | 288 | } catch ( NoSuchObjectException $e ) { // source object does not exist |
| 289 | 289 | $status->fatal( 'backend-fail-copy', $params['src'], $params['dst'] ); |
| 290 | 290 | } catch ( InvalidResponseException $e ) { |
| 291 | | - $status->fatal( 'backend-fail-connect' ); |
| | 291 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 292 | 292 | } catch ( Exception $e ) { // some other exception? |
| 293 | 293 | $status->fatal( 'backend-fail-internal' ); |
| 294 | 294 | $this->logException( $e, __METHOD__, $params ); |
| — | — | @@ -311,7 +311,7 @@ |
| 312 | 312 | // (a) Get a swift proxy connection |
| 313 | 313 | $conn = $this->getConnection(); |
| 314 | 314 | if ( !$conn ) { |
| 315 | | - $status->fatal( 'backend-fail-connect' ); |
| | 315 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 316 | 316 | return $status; |
| 317 | 317 | } |
| 318 | 318 | |
| — | — | @@ -322,7 +322,7 @@ |
| 323 | 323 | $status->fatal( 'backend-fail-delete', $params['src'] ); |
| 324 | 324 | return $status; |
| 325 | 325 | } catch ( InvalidResponseException $e ) { |
| 326 | | - $status->fatal( 'backend-fail-connect' ); |
| | 326 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 327 | 327 | return $status; |
| 328 | 328 | } catch ( Exception $e ) { // some other exception? |
| 329 | 329 | $status->fatal( 'backend-fail-internal' ); |
| — | — | @@ -338,7 +338,7 @@ |
| 339 | 339 | $status->fatal( 'backend-fail-delete', $params['src'] ); |
| 340 | 340 | } |
| 341 | 341 | } catch ( InvalidResponseException $e ) { |
| 342 | | - $status->fatal( 'backend-fail-connect' ); |
| | 342 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 343 | 343 | } catch ( Exception $e ) { // some other exception? |
| 344 | 344 | $status->fatal( 'backend-fail-internal' ); |
| 345 | 345 | $this->logException( $e, __METHOD__, $params ); |
| — | — | @@ -356,7 +356,7 @@ |
| 357 | 357 | // (a) Get a swift proxy connection |
| 358 | 358 | $conn = $this->getConnection(); |
| 359 | 359 | if ( !$conn ) { |
| 360 | | - $status->fatal( 'backend-fail-connect' ); |
| | 360 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 361 | 361 | return $status; |
| 362 | 362 | } |
| 363 | 363 | |
| — | — | @@ -364,7 +364,7 @@ |
| 365 | 365 | try { |
| 366 | 366 | $conn->create_container( $fullCont ); |
| 367 | 367 | } catch ( InvalidResponseException $e ) { |
| 368 | | - $status->fatal( 'backend-fail-connect' ); |
| | 368 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 369 | 369 | } catch ( Exception $e ) { // some other exception? |
| 370 | 370 | $status->fatal( 'backend-fail-internal' ); |
| 371 | 371 | $this->logException( $e, __METHOD__, $params ); |
| — | — | @@ -513,7 +513,7 @@ |
| 514 | 514 | |
| 515 | 515 | $conn = $this->getConnection(); |
| 516 | 516 | if ( !$conn ) { |
| 517 | | - $status->fatal( 'backend-fail-connect' ); |
| | 517 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 518 | 518 | } |
| 519 | 519 | |
| 520 | 520 | try { |
| — | — | @@ -538,7 +538,7 @@ |
| 539 | 539 | $output = fopen("php://output", "w"); |
| 540 | 540 | $obj->stream( $output ); |
| 541 | 541 | } catch ( InvalidResponseException $e ) { |
| 542 | | - $status->fatal( 'backend-fail-connect' ); |
| | 542 | + $status->fatal( 'backend-fail-connect', $this->name ); |
| 543 | 543 | } catch ( Exception $e ) { // some other exception? |
| 544 | 544 | $status->fatal( 'backend-fail-stream', $params['src'] ); |
| 545 | 545 | $this->logException( $e, __METHOD__, $params ); |