From 3ebb384513c9b21501e71c77a98639f435cc7ec4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gerg=C5=91=20Tisza?= <gtisza@wikimedia.org>
Date: Thu, 23 Jul 2015 20:02:22 +0000
Subject: [PATCH] Log exceptions in the StatsD process

Change-Id: Iff14cbbfbe81d38c55b41ff115c66156323df035
---
 includes/GlobalFunctions.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 6f354c351f..167305d9ab 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1254,12 +1254,16 @@ function wfLogProfilingData() {
 
 	$config = $context->getConfig();
 	if ( $config->get( 'StatsdServer' ) ) {
-		$statsdServer = explode( ':', $config->get( 'StatsdServer' ) );
-		$statsdHost = $statsdServer[0];
-		$statsdPort = isset( $statsdServer[1] ) ? $statsdServer[1] : 8125;
-		$statsdSender = new SocketSender( $statsdHost, $statsdPort );
-		$statsdClient = new StatsdClient( $statsdSender );
-		$statsdClient->send( $context->getStats()->getBuffer() );
+		try {
+			$statsdServer = explode( ':', $config->get( 'StatsdServer' ) );
+			$statsdHost = $statsdServer[0];
+			$statsdPort = isset( $statsdServer[1] ) ? $statsdServer[1] : 8125;
+			$statsdSender = new SocketSender( $statsdHost, $statsdPort );
+			$statsdClient = new StatsdClient( $statsdSender, true, false );
+			$statsdClient->send( $context->getStats()->getBuffer() );
+		} catch ( Exception $ex ) {
+			MWExceptionHandler::logException( $ex );
+		}
 	}
 
 	# Profiling must actually be enabled...
-- 
2.20.1