https://www.mediawiki.org/wiki/Special:Code/MediaWiki/107197
Revision: 107197 Author: aaron Date: 2011-12-24 00:43:06 +0000 (Sat, 24 Dec 2011) Log Message: ----------- * 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. Modified Paths: -------------- trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php trunk/phase3/languages/messages/MessagesEn.php trunk/phase3/languages/messages/MessagesQqq.php Modified: trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php =================================================================== --- trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php 2011-12-24 00:42:31 UTC (rev 107196) +++ trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php 2011-12-24 00:43:06 UTC (rev 107197) @@ -111,7 +111,9 @@ 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 ) { Modified: trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php =================================================================== --- trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php 2011-12-24 00:42:31 UTC (rev 107196) +++ trunk/phase3/includes/filerepo/backend/lockmanager/LSLockManager.php 2011-12-24 00:43:06 UTC (rev 107197) @@ -88,13 +88,17 @@ 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; } Modified: trunk/phase3/languages/messages/MessagesEn.php =================================================================== --- trunk/phase3/languages/messages/MessagesEn.php 2011-12-24 00:42:31 UTC (rev 107196) +++ trunk/phase3/languages/messages/MessagesEn.php 2011-12-24 00:43:06 UTC (rev 107197) @@ -2254,13 +2254,12 @@ '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.', Modified: trunk/phase3/languages/messages/MessagesQqq.php =================================================================== --- trunk/phase3/languages/messages/MessagesQqq.php 2011-12-24 00:42:31 UTC (rev 107196) +++ trunk/phase3/languages/messages/MessagesQqq.php 2011-12-24 00:43:06 UTC (rev 107197) @@ -1903,19 +1903,17 @@ # 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: _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs