From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 15 Apr 2016 22:21:04 +0000 (-0700)
Subject: Remove experimental MCRD class
X-Git-Tag: 1.31.0-rc.0~7279^2
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=fa35ddf39556915bdfdad65ce0fe45eaba6b9807;p=lhc%2Fweb%2Fwiklou.git

Remove experimental MCRD class

Change-Id: I0282240cb325037354d22bc0eef89780084611d2
---

diff --git a/autoload.php b/autoload.php
index c3e988c12a..22411cd7e9 100644
--- a/autoload.php
+++ b/autoload.php
@@ -397,7 +397,6 @@ $wgAutoloadLocalClasses = [
 	'ErrorPageError' => __DIR__ . '/includes/exception/ErrorPageError.php',
 	'EventRelayer' => __DIR__ . '/includes/libs/eventrelayer/EventRelayer.php',
 	'EventRelayerGroup' => __DIR__ . '/includes/EventRelayerGroup.php',
-	'EventRelayerMCRD' => __DIR__ . '/includes/libs/eventrelayer/EventRelayerMCRD.php',
 	'EventRelayerNull' => __DIR__ . '/includes/libs/eventrelayer/EventRelayerNull.php',
 	'Exif' => __DIR__ . '/includes/media/Exif.php',
 	'ExifBitmapHandler' => __DIR__ . '/includes/media/ExifBitmap.php',
diff --git a/includes/libs/eventrelayer/EventRelayerMCRD.php b/includes/libs/eventrelayer/EventRelayerMCRD.php
deleted file mode 100644
index 4bcdf123ab..0000000000
--- a/includes/libs/eventrelayer/EventRelayerMCRD.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Aaron Schulz
- */
-
-/**
- * Relayed that uses the mcrelaypushd server
- */
-class EventRelayerMCRD extends EventRelayer {
-	/** @var MultiHttpClient */
-	protected $http;
-	/** @var string */
-	protected $baseUrl;
-
-	/**
-	 * Additional params include 'mcrdConfig', which is a map of:
-	 *   - url : The base URL of the service (without paths)
-	 * @param array $params
-	 */
-	public function __construct( array $params ) {
-		parent::__construct( $params );
-
-		$this->baseUrl = $params['mcrdConfig']['url'];
-
-		$httpConfig = isset( $params['httpConfig'] ) ? $params['httpConfig'] : [];
-		if ( !isset( $httpConfig['connTimeout'] ) ) {
-			$httpConfig['connTimeout'] = 1;
-		}
-		if ( !isset( $httpConfig['reqTimeout'] ) ) {
-			$httpConfig['reqTimeout'] = .25;
-		}
-
-		$this->http = new MultiHttpClient( $httpConfig );
-	}
-
-	protected function doNotify( $channel, array $events ) {
-		if ( !count( $events ) ) {
-			return true;
-		}
-
-		$response = $this->http->run( [
-			'url'     => "{$this->baseUrl}/relayer/api/v1.0/" . rawurlencode( $channel ),
-			'method'  => 'POST',
-			'body'    => json_encode( [ 'events' => $events ] ),
-			'headers' => [ 'content-type' => 'application/json' ]
-		] );
-
-		return $response['code'] == 201;
-	}
-}