From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 10 Nov 2015 04:40:31 +0000 (+0000)
Subject: resourceloader: Log if MessageBlobStore failed to fetch a message
X-Git-Tag: 1.31.0-rc.0~9030^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=e53bf8bdcbe6186a283cb7a2acd26f731f4aa52d;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Log if MessageBlobStore failed to fetch a message

Bug: T93800
Change-Id: I6f174251a6b9a6b31921037f672dbc197f3abb7e
---

diff --git a/includes/cache/MessageBlobStore.php b/includes/cache/MessageBlobStore.php
index ab7e1717c5..dcb358f1db 100644
--- a/includes/cache/MessageBlobStore.php
+++ b/includes/cache/MessageBlobStore.php
@@ -321,6 +321,19 @@ class MessageBlobStore {
 		return $updates;
 	}
 
+	/**
+	 * @param string $key Message key
+	 * @param string $lang Language code
+	 * @return string
+	 */
+	private function fetchMessage( $key, $lang ) {
+		$message = wfMessage( $key )->inLanguage( $lang );
+		if ( !$message->exists() ) {
+			wfDebugLog( 'resourceloader', __METHOD__ . " failed to find: '$key' ($lang)" );
+		}
+		return $message->plain();
+	}
+
 	/**
 	 * Reencode a message blob with the updated value for a message
 	 *
@@ -331,8 +344,7 @@ class MessageBlobStore {
 	 */
 	private function reencodeBlob( $blob, $key, $lang ) {
 		$decoded = FormatJson::decode( $blob, true );
-		$decoded[$key] = wfMessage( $key )->inLanguage( $lang )->plain();
-
+		$decoded[$key] = $this->fetchMessage( $key, $lang );
 		return FormatJson::encode( (object)$decoded );
 	}
 
@@ -390,7 +402,7 @@ class MessageBlobStore {
 		$messages = array();
 
 		foreach ( $module->getMessages() as $key ) {
-			$messages[$key] = wfMessage( $key )->inLanguage( $lang )->plain();
+			$messages[$key] = $this->fetchMessage( $key, $lang );
 		}
 
 		return FormatJson::encode( (object)$messages );