From: Antoine Musso Date: Wed, 24 Jul 2019 10:14:33 +0000 (+0200) Subject: Drop newlines in LocalisationCache debug logs X-Git-Tag: 1.34.0-rc.0~899^2 X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=8a0878177d6d56467fcf7fdf9c0830be0d288494;p=lhc%2Fweb%2Fwiklou.git Drop newlines in LocalisationCache debug logs 316d205115c migrated LocalisationCache from wfDebugLog() to the Logger interface which no more requires the messages to be terminated with a new line. Change-Id: Ibe2f750e7ab16cf91801988cb726adb67f7cd9d2 --- diff --git a/includes/cache/localisation/LocalisationCache.php b/includes/cache/localisation/LocalisationCache.php index a0f3d8e28c..ffc7cd00d6 100644 --- a/includes/cache/localisation/LocalisationCache.php +++ b/includes/cache/localisation/LocalisationCache.php @@ -407,7 +407,7 @@ class LocalisationCache { */ public function isExpired( $code ) { if ( $this->forceRecache && !isset( $this->recachedLangs[$code] ) ) { - $this->logger->debug( __METHOD__ . "($code): forced reload\n" ); + $this->logger->debug( __METHOD__ . "($code): forced reload" ); return true; } @@ -417,7 +417,7 @@ class LocalisationCache { $preload = $this->store->get( $code, 'preload' ); // Different keys may expire separately for some stores if ( $deps === null || $keys === null || $preload === null ) { - $this->logger->debug( __METHOD__ . "($code): cache missing, need to make one\n" ); + $this->logger->debug( __METHOD__ . "($code): cache missing, need to make one" ); return true; } @@ -429,7 +429,7 @@ class LocalisationCache { // When this happens, always expire the cache if ( !$dep instanceof CacheDependency || $dep->isExpired() ) { $this->logger->debug( __METHOD__ . "($code): cache for $code expired due to " . - get_class( $dep ) . "\n" ); + get_class( $dep ) ); return true; } @@ -836,10 +836,10 @@ class LocalisationCache { # Load the primary localisation from the source file $data = $this->readSourceFilesAndRegisterDeps( $code, $deps ); if ( $data === false ) { - $this->logger->debug( __METHOD__ . ": no localisation file for $code, using fallback to en\n" ); + $this->logger->debug( __METHOD__ . ": no localisation file for $code, using fallback to en" ); $coreData['fallback'] = 'en'; } else { - $this->logger->debug( __METHOD__ . ": got localisation for $code from source\n" ); + $this->logger->debug( __METHOD__ . ": got localisation for $code from source" ); # Merge primary localisation foreach ( $data as $key => $value ) {