From 7de2f11c1d5ef539388ab8eac9c0d805f2fcf8f0 Mon Sep 17 00:00:00 2001 From: addshore Date: Wed, 1 Aug 2018 22:22:13 +0100 Subject: [PATCH] Fix PerDbnameStatsdDataFactory metric prefix again prefix = 'MediaWiki.' will result in 'MediaWiki..dbname' Preventing that is the only purpose of the rtrim(), we don't support whitespace there Change-Id: I72383aae908dbc89688cd3bebba36d389cde3f29 --- includes/ServiceWiring.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index 66b4c0c810..b2211ec646 100644 --- a/includes/ServiceWiring.php +++ b/includes/ServiceWiring.php @@ -137,7 +137,7 @@ return [ $config = $services->getMainConfig(); $wiki = $config->get( 'DBname' ); return new BufferingStatsdDataFactory( - rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ) ) . '.' . $wiki + rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ), '.' ) . '.' . $wiki ); }, -- 2.20.1