From: Max Semenik <maxsem.wiki@gmail.com>
Date: Fri, 29 Jan 2016 00:23:22 +0000 (-0800)
Subject: KafkaHandler: allow customizing timeouts
X-Git-Tag: 1.31.0-rc.0~8161^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=commitdiff_plain;h=15d85cf20dc26d981d45c7df5fb39b85d8350c5d;p=lhc%2Fweb%2Fwiklou.git

KafkaHandler: allow customizing timeouts

Bug: T125084
Change-Id: I8f01fa61d916aeaa831a84e12b6fae08d04ca046
---

diff --git a/includes/debug/logger/monolog/KafkaHandler.php b/includes/debug/logger/monolog/KafkaHandler.php
index 4e8e65bd6f..24659186f6 100644
--- a/includes/debug/logger/monolog/KafkaHandler.php
+++ b/includes/debug/logger/monolog/KafkaHandler.php
@@ -99,9 +99,25 @@ class KafkaHandler extends AbstractProcessingHandler {
 	) {
 		$metadata = new MetaDataFromKafka( $kafkaServers );
 		$produce = new Produce( $metadata );
+
+		if ( isset( $options['sendTimeout'] ) ) {
+			$timeOut = $options['sendTimeout'];
+			$produce->getClient()->setStreamOption( 'SendTimeoutSec', 0 );
+			$produce->getClient()->setStreamOption( 'SendTimeoutUSec',
+				intval( $timeOut * 1000000 )
+			);
+		}
+		if ( isset( $options['recvTimeout'] ) ) {
+			$timeOut = $options['recvTimeout'];
+			$produce->getClient()->setStreamOption( 'RecvTimeoutSec', 0 );
+			$produce->getClient()->setStreamOption( 'RecvTimeoutUSec',
+				intval( $timeOut * 1000000 )
+			);
+		}
 		if ( isset( $options['logExceptions'] ) && is_string( $options['logExceptions'] ) ) {
 			$options['logExceptions'] = LoggerFactory::getInstance( $options['logExceptions'] );
 		}
+
 		return new self( $produce, $options, $level, $bubble );
 	}