From: C. Scott Ananian <cscott@cscott.net>
Date: Mon, 14 Sep 2015 18:36:18 +0000 (-0400)
Subject: Provide VRS objects with a name for more informative debugging/logging
X-Git-Tag: 1.31.0-rc.0~10028^2
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=195ea84883aea48b72a2c9f524da74ee8ae6730c;p=lhc%2Fweb%2Fwiklou.git

Provide VRS objects with a name for more informative debugging/logging

Bug: T112330
Change-Id: Iaa3af55ebc426d54e8bef94dba5415bc535e096b
---

diff --git a/includes/libs/virtualrest/ParsoidVirtualRESTService.php b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
index 2a179be6e7..43dfab3cf2 100644
--- a/includes/libs/virtualrest/ParsoidVirtualRESTService.php
+++ b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
@@ -54,6 +54,7 @@ class ParsoidVirtualRESTService extends VirtualRESTService {
 		}
 		// set up defaults and merge them with the given params
 		$mparams = array_merge( array(
+			'name' => 'parsoid',
 			'url' => 'http://localhost:8000/',
 			'prefix' => 'localhost',
 			'domain' => 'localhost',
diff --git a/includes/libs/virtualrest/RestbaseVirtualRESTService.php b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
index bc520aa106..3a7bc5877c 100644
--- a/includes/libs/virtualrest/RestbaseVirtualRESTService.php
+++ b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
@@ -48,6 +48,7 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
 	public function __construct( array $params ) {
 		// set up defaults and merge them with the given params
 		$mparams = array_merge( array(
+			'name' => 'restbase',
 			'url' => 'http://localhost:7231/',
 			'domain' => 'localhost',
 			'timeout' => 100,
diff --git a/includes/libs/virtualrest/SwiftVirtualRESTService.php b/includes/libs/virtualrest/SwiftVirtualRESTService.php
index 011dabe080..88b0e1f14a 100644
--- a/includes/libs/virtualrest/SwiftVirtualRESTService.php
+++ b/includes/libs/virtualrest/SwiftVirtualRESTService.php
@@ -45,7 +45,11 @@ class SwiftVirtualRESTService extends VirtualRESTService {
 	 *   - swiftAuthTTL       : Swift authentication TTL (seconds)
 	 */
 	public function __construct( array $params ) {
-		parent::__construct( $params );
+		// set up defaults and merge them with the given params
+		$mparams = array_merge( array(
+			'name' => 'swift'
+		), $params );
+		parent::__construct( $mparams );
 	}
 
 	/**
diff --git a/includes/libs/virtualrest/VirtualRESTService.php b/includes/libs/virtualrest/VirtualRESTService.php
index 2a0b3f088d..01a4ea6edf 100644
--- a/includes/libs/virtualrest/VirtualRESTService.php
+++ b/includes/libs/virtualrest/VirtualRESTService.php
@@ -44,6 +44,17 @@ abstract class VirtualRESTService {
 		$this->params = $params;
 	}
 
+	/**
+	 * Return the name of this service, in a form suitable for error
+	 * reporting or debugging.
+	 *
+	 * @return string The name of the service behind this VRS object.
+	 */
+	public function getName() {
+		return isset( $this->params['name'] ) ? $this->params['name'] :
+			get_class( $this );
+	}
+
 	/**
 	 * Prepare virtual HTTP(S) requests (for this service) for execution
 	 *