$cache = $this->wanCache;
$checkKeys = [
// Global check key, see clear()
- $cache->makeKey( __CLASS__ )
+ $cache->makeGlobalKey( __CLASS__ )
];
$cacheKeys = [];
foreach ( $modules as $name => $module ) {
return $blobs;
}
- /**
- * @deprecated since 1.27 Use getBlobs() instead
- * @return array
- */
- public function get( ResourceLoader $resourceLoader, $modules, $lang ) {
- return $this->getBlobs( $modules, $lang );
- }
-
/**
* @since 1.27
* @param ResourceLoaderModule $module
*/
public function clear() {
$cache = $this->wanCache;
- // Disable holdoff because this invalidates all modules and also not needed since
- // LocalisationCache is stored outside the database and doesn't have lag.
- $cache->touchCheckKey( $cache->makeKey( __CLASS__ ), $cache::HOLDOFF_NONE );
+ // Disable hold-off because:
+ // - LocalisationCache is populated by messages on-disk and don't have DB lag,
+ // thus there is no need for hold off. We only clear it after new localisation
+ // updates are known to be deployed to all servers.
+ // - This global check key invalidates message blobs for all modules for all wikis
+ // in cache contexts (e.g. languages, skins). Setting a hold-off on this key could
+ // cause a cache stampede since no values would be stored for several seconds.
+ $cache->touchCheckKey( $cache->makeGlobalKey( __CLASS__ ), $cache::HOLDOFF_NONE );
}
/**
* @since 1.27
* @param string $key Message key
* @param string $lang Language code
- * @return string
+ * @return string|null
*/
protected function fetchMessage( $key, $lang ) {
$message = wfMessage( $key )->inLanguage( $lang );
- $value = $message->plain();
if ( !$message->exists() ) {
$this->logger->warning( 'Failed to find {messageKey} ({lang})', [
'messageKey' => $key,
'lang' => $lang,
] );
+ $value = null;
+ } else {
+ $value = $message->plain();
}
return $value;
}
private function generateMessageBlob( ResourceLoaderModule $module, $lang ) {
$messages = [];
foreach ( $module->getMessages() as $key ) {
- $messages[$key] = $this->fetchMessage( $key, $lang );
+ $value = $this->fetchMessage( $key, $lang );
+ if ( $value !== null ) {
+ $messages[$key] = $value;
+ }
}
$json = FormatJson::encode( (object)$messages );