update to MediaWiki 1.16.0

1 files changed, 41 insertions, 19 deletions

diff --git a/maintenance/getSlaveServer.php b/maintenance/getSlaveServer.php
index 25258267..eac97a59 100644
--- a/maintenance/getSlaveServer.php
+++ b/maintenance/getSlaveServer.php
@@ -2,27 +2,49 @@
 /**
  * This script reports the hostname of a slave server.
  *
- * @file
+ * 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
+ *
  * @ingroup Maintenance
  */
+ 
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
-require_once( dirname(__FILE__).'/commandLine.inc' );
-
-if ( $wgAllDBsAreLocalhost ) {
-	# Can't fool the backup script
-	print "localhost\n";
-	exit;
+class GetSlaveServer extends Maintenance {
+	public function __construct() {
+		parent::__construct();
+		$this->addOption( "group", "Query group to check specifically" );
+		$this->mDescription = "Report the hostname of a slave server";
+	}
+	public function execute() {
+		global $wgAllDBsAreLocalhost;
+		if( $wgAllDBsAreLocalhost ) {
+			$host = 'localhost';
+		} else {
+			if( $this->hasOption('group') ) {
+				$db = wfGetDB( DB_SLAVE, $this->getOption('group') );
+				$host = $db->getServer();
+			} else {
+				$lb = wfGetLB();
+				$i = $lb->getReaderIndex();
+				$host = $lb->getServerName( $i );
+			}
+		}
+		$this->output( "$host\n" );
+	}
 }
 
-if( isset( $options['group'] ) ) {
-	$db = wfGetDB( DB_SLAVE, $options['group'] );
-	$host = $db->getServer();
-} else {
-	$lb = wfGetLB();
-	$i = $lb->getReaderIndex();
-	$host = $lb->getServerName( $i );
-}
-
-print "$host\n";
-
-
+$maintClass = "GetSlaveServer";
+require_once( DO_MAINTENANCE );