From ca78908048b87722200036e6d0a25d67121350af Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 24 Dec 2011 00:43:06 +0000 Subject: [PATCH] * Follow-up r107195: these params are resource paths now, rather than hashes of the resource paths. * Removed lockmanager-fail-acquirelocks message; a series of lockmanager-fail-acquirelock messages are now used instead. --- .../filerepo/backend/lockmanager/DBLockManager.php | 4 +++- .../filerepo/backend/lockmanager/LSLockManager.php | 8 ++++++-- languages/messages/MessagesEn.php | 13 ++++++------- languages/messages/MessagesQqq.php | 14 ++++++-------- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/includes/filerepo/backend/lockmanager/DBLockManager.php b/includes/filerepo/backend/lockmanager/DBLockManager.php index 0b9bcbbbac..004caa8d31 100644 --- a/includes/filerepo/backend/lockmanager/DBLockManager.php +++ b/includes/filerepo/backend/lockmanager/DBLockManager.php @@ -111,7 +111,9 @@ class DBLockManager extends LockManager { if ( $res === 'cantacquire' ) { // Resources already locked by another process. // Abort and unlock everything we just locked. - $status->fatal( 'lockmanager-fail-acquirelocks', implode( ', ', $paths ) ); + foreach ( $paths as $path ) { + $status->fatal( 'lockmanager-fail-acquirelock', $path ); + } $status->merge( $this->doUnlock( $lockedPaths, $type ) ); return $status; } elseif ( $res !== true ) { diff --git a/includes/filerepo/backend/lockmanager/LSLockManager.php b/includes/filerepo/backend/lockmanager/LSLockManager.php index 45f26e8e8a..5ae51b1a05 100644 --- a/includes/filerepo/backend/lockmanager/LSLockManager.php +++ b/includes/filerepo/backend/lockmanager/LSLockManager.php @@ -88,13 +88,17 @@ class LSLockManager extends LockManager { if ( $res === 'cantacquire' ) { // Resources already locked by another process. // Abort and unlock everything we just locked. - $status->fatal( 'lockmanager-fail-acquirelocks', implode( ', ', $paths ) ); + foreach ( $paths as $path ) { + $status->fatal( 'lockmanager-fail-acquirelock', $path ); + } $status->merge( $this->doUnlock( $lockedPaths, $type ) ); return $status; } elseif ( $res !== true ) { // Couldn't contact any servers for this bucket. // Abort and unlock everything we just locked. - $status->fatal( 'lockmanager-fail-acquirelocks', implode( ', ', $paths ) ); + foreach ( $paths as $path ) { + $status->fatal( 'lockmanager-fail-acquirelock', $path ); + } $status->merge( $this->doUnlock( $lockedPaths, $type ) ); return $status; } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 52807a88ce..812110767d 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2254,13 +2254,12 @@ If the problem persists, contact an [[Special:ListUsers/sysop|administrator]].', 'backend-fail-create' => 'Could not create file $1.', # Lock manager -'lockmanager-notlocked' => 'Could not unlock hash key "$1"; it is not locked.', -'lockmanager-fail-closelock' => 'Could not close lock file for hash key "$1".', -'lockmanager-fail-deletelock' => 'Could not delete lock file for hash key "$1".', -'lockmanager-fail-acquirelock' => 'Could not acquire lock for hash key "$1".', -'lockmanager-fail-openlock' => 'Could not open lock file for hash key "$1".', -'lockmanager-fail-releaselock' => 'Could not release lock for hash key "$1".', -'lockmanager-fail-acquirelocks' => 'Could not acquire locks for hash keys "$1".', +'lockmanager-notlocked' => 'Could not unlock "$1"; it is not locked.', +'lockmanager-fail-closelock' => 'Could not close lock file for "$1".', +'lockmanager-fail-deletelock' => 'Could not delete lock file for "$1".', +'lockmanager-fail-acquirelock' => 'Could not acquire lock for "$1".', +'lockmanager-fail-openlock' => 'Could not open lock file for "$1".', +'lockmanager-fail-releaselock' => 'Could not release lock for "$1".', 'lockmanager-fail-db-bucket' => 'Could not contact enough lock databases in bucket $1.', 'lockmanager-fail-db-release' => 'Could not release locks on database $1.', 'lockmanager-fail-svr-release' => 'Could not release locks on server $1.', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index 758d5cb438..e5b5e2ac5e 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -1903,19 +1903,17 @@ Extensions making use of it: # Lock manager 'lockmanager-notlocked' => 'Parameters: -* $1 is a key name.', +* $1 is a resource path (e.g. "mwstore://media-public/a/ab/file.jpg").', 'lockmanager-fail-closelock' => 'Parameters: -* $1 is a key name.', +* $1 is a resource path (e.g. "mwstore://media-public/a/ab/file.jpg").', 'lockmanager-fail-deletelock' => 'Parameters: -* $1 is a key name.', +* $1 is a resource path (e.g. "mwstore://media-public/a/ab/file.jpg").', 'lockmanager-fail-acquirelock' => 'Parameters: -* $1 is a key name.', +* $1 is a resource path (e.g. "mwstore://media-public/a/ab/file.jpg").', 'lockmanager-fail-openlock' => 'Parameters: -* $1 is a key name.', +* $1 is a resource path (e.g. "mwstore://media-public/a/ab/file.jpg").', 'lockmanager-fail-releaselock' => 'Parameters: -* $1 is a key name.', -'lockmanager-fail-acquirelocks' => 'Parameters: -* $1 is a list of key names.', +* $1 is a resource path (e.g. "mwstore://media-public/a/ab/file.jpg").', 'lockmanager-fail-db-bucket' => 'Parameters: * $1 is a bucket name.', 'lockmanager-fail-db-release' => 'Parameters: -- 2.20.1