(k) fix minor glitch in installExtension.php
[lhc/web/wiklou.git] / maintenance / commandLine.inc
index 72f1f19..93edce1 100644 (file)
@@ -1,50 +1,80 @@
 <?php
+/**
+ * @todo document
+ * @package MediaWiki
+ * @subpackage Maintenance
+ */
 
+$wgRequestTime = microtime(true);
+
+/** */
 # Abort if called from a web server
 if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
        print "This script must be run from the command line\n";
        exit();
 }
 
-define("MEDIAWIKI",true);
+define('MEDIAWIKI',true);
 
 # Process command line arguments
 # $options becomes an array with keys set to the option names
 # $optionsWithArgs is an array of GNU-style options that take an argument. The arguments are returned
 # in the values of $options.
+# $args becomes a zero-based array containing the non-option arguments
 
 if ( !isset( $optionsWithArgs ) ) {
        $optionsWithArgs = array();
 }
+$optionsWithArgs[] = 'conf'; # For specifying the location of LocalSettings.php
 
 $self = array_shift( $argv );
-$IP = realpath( dirname( $self ) . "/.." );
-chdir( $IP );
+$IP = realpath( dirname( __FILE__ ) . '/..' );
+#chdir( $IP );
+require_once( "$IP/StartProfiler.php" );
 
 $options = array();
 $args = array();
 
+
+# Parse arguments
 for( $arg = reset( $argv ); $arg !== false; $arg = next( $argv ) ) {
-       if ( substr( $arg, 0, 2 ) == '--' ) {
+       if ( $arg == '--' ) {
+               # End of options, remainder should be considered arguments
+               $arg = next( $argv );
+               while( $arg !== false ) {
+                       $args[] = $arg;
+                       $arg = next( $argv );
+               }
+               break;
+       } elseif ( substr( $arg, 0, 2 ) == '--' ) {
                # Long options
                $option = substr( $arg, 2 );
                if ( in_array( $option, $optionsWithArgs ) ) {
                        $param = next( $argv );
                        if ( $param === false ) {
-                               die( "$arg needs an value after it\n" );
+                               echo "$arg needs an value after it\n";
+                               die( -1 );
                        }
                        $options[$option] = $param;
                } else {
-                       $options[$option] = 1;
+                       $bits = explode( '=', $option, 2 );
+                       if( count( $bits ) > 1 ) {
+                               $option = $bits[0];
+                               $param = $bits[1];
+                       } else {
+                               $param = 1;
+                       }
+                       $options[$option] = $param;
                }
-       } elseif ( $arg{0} == '-' ) {
+       } elseif ( substr( $arg, 0, 1 ) == '-' ) {
                # Short options
                for ( $p=1; $p<strlen( $arg ); $p++ ) {
                        $option = $arg{$p};
                        if ( in_array( $option, $optionsWithArgs ) ) {
                                $param = next( $argv );
                                if ( $param === false ) {
-                                       die( "$arg needs an value after it\n" );
+                                       echo "$arg needs an value after it\n";
+                                       die( -1 );
                                }
                                $options[$option] = $param;
                        } else {
@@ -56,81 +86,146 @@ for( $arg = reset( $argv ); $arg !== false; $arg = next( $argv ) ) {
        }
 }
 
+
 # General initialisation
 
 $wgCommandLineMode = true;
 # Turn off output buffering if it's on
 @ob_end_flush();
-$sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":";
+$sep = PATH_SEPARATOR;
 
-if ( $sep == ":" && strpos( `hostname`, "wikimedia.org" ) !== false ) {
+if (!isset( $wgUseNormalUser ) ) {
+       $wgUseNormalUser = false;
+}
+
+if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
        $wgWikiFarm = true;
+       $cluster = trim( file_get_contents( '/etc/cluster' ) );
        require_once( "$IP/includes/SiteConfiguration.php" );
 
-       # Get $conf
-       require( "$IP/InitialiseSettings.php" );
+       # Get $wgConf
+       require( "$IP/wgConf.php" );
 
-       # Check if we were passed a db name
-       $db = array_shift( $args );
-       list( $site, $lang ) = $conf->siteFromDB( $db );
+       if ( empty( $wgNoDBParam ) ) {
+               # Check if we were passed a db name
+               $db = array_shift( $args );
+               list( $site, $lang ) = $wgConf->siteFromDB( $db );
 
-       # If not, work out the language and site the old way
-       if ( is_null( $site ) || is_null( $lang ) ) {
-               if ( !$db ) {   
-                       $lang = "aa";
-               } else {
-                       $lang = $db;
-               }
-               if ( isset( $args[0] ) ) {
-                       $site = array_shift( $args );
-               } else {
-                       $site = "wikipedia";
+               # If not, work out the language and site the old way
+               if ( is_null( $site ) || is_null( $lang ) ) {
+                       if ( !$db ) {
+                               $lang = 'aa';
+                       } else {
+                               $lang = $db;
+                       }
+                       if ( isset( $args[0] ) ) {
+                               $site = array_shift( $args );
+                       } else {
+                               $site = 'wikipedia';
+                       }
                }
+       } else {
+               $lang = 'aa';
+               $site = 'wikipedia';
        }
 
        # This is for the IRC scripts, which now run as the apache user
        # The apache user doesn't have access to the wikiadmin_pass command
-       if ( $_ENV['USER'] != "apache" ) {
-               $wgDBuser = $wgDBadminuser = "wikiadmin";
-               $wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`);
+       if ( $_ENV['USER'] == 'apache' ) {
+               $wgUseNormalUser = true;
        }
 
-       putenv( "wikilang=$lang");
+       putenv( 'wikilang='.$lang);
 
        $DP = $IP;
-       ini_set( "include_path", ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
-
-       require_once( "$IP/includes/Defines.php" );
-       require_once( "/home/wikipedia/common/php-new/CommonSettings.php" );
+       ini_set( 'include_path', ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
+
+       #require_once( $IP.'/includes/ProfilerStub.php' );
+       require_once( $IP.'/includes/Defines.php' );
+       require_once( $IP.'/CommonSettings.php' );
+
+       $bin = '/home/wikipedia/bin';
+       if ( $wgUseRootUser ) {
+               $wgDBuser = $wgDBadminuser = 'root';
+               $wgDBpassword = $wgDBadminpassword = trim(`$bin/mysql_root_pass`);
+       } elseif ( !$wgUseNormalUser ) {
+               $wgDBuser = $wgDBadminuser = 'wikiadmin';
+               $wgDBpassword = $wgDBadminpassword = trim(`$bin/wikiadmin_pass`);
+       }
 } else {
        $wgWikiFarm = false;
-       $settingsFile = "$IP/LocalSettings.php";
+       if ( isset( $options['conf'] ) ) {
+               $settingsFile = $options['conf'];
+       } else {
+               $settingsFile = "$IP/LocalSettings.php";
+       }
 
        if ( ! is_readable( $settingsFile ) ) {
                print "A copy of your installation's LocalSettings.php\n" .
                  "must exist in the source directory.\n";
-               exit();
+               exit( 1 );
        }
        $wgCommandLineMode = true;
        $DP = $IP;
-       require_once( "$IP/includes/Defines.php" );
+       #require_once( $IP.'/includes/ProfilerStub.php' );
+       require_once( $IP.'/includes/Defines.php' );
        require_once( $settingsFile );
-       ini_set( "include_path", ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" );
-       require_once( "$IP/AdminSettings.php" );
+       ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" );
+
+       if ( is_readable( $IP.'/AdminSettings.php' ) ) {
+               require_once( $IP.'/AdminSettings.php' );
+       }
 }
 
 # Turn off output buffering again, it might have been turned on in the settings files
 @ob_end_flush();
 # Same with these
 $wgCommandLineMode = true;
-$wgDBuser = $wgDBadminuser;
-$wgDBpassword = $wgDBadminpassword;
 
+if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
+       $wgDBuser = $wgDBadminuser;
+       $wgDBpassword = $wgDBadminpassword;
+
+       if( $wgDBservers ) {
+               foreach ( $wgDBservers as $i => $server ) {
+                       $wgDBservers[$i]['user'] = $wgDBuser;
+                       $wgDBservers[$i]['password'] = $wgDBpassword;
+               }
+       }
+}
+
+if ( defined( 'MW_CMDLINE_CALLBACK' ) ) {
+       $fn = MW_CMDLINE_CALLBACK;
+       $fn();
+}
+
+ini_set( 'memory_limit', -1 );
 
-$wgUsePHPTal = false;
-require_once( "Setup.php" );
-require_once( "install-utils.inc" );
-$wgTitle = Title::newFromText( "Command line script" );
+require_once( 'Setup.php' );
+require_once( 'install-utils.inc' );
+$wgTitle = null; # Much much faster startup than creating a title object
 set_time_limit(0);
 
+// --------------------------------------------------------------------
+// Functions
+// --------------------------------------------------------------------
+
+function wfWaitForSlaves( $maxLag ) {
+       global $wgLoadBalancer;
+       if ( $maxLag ) {
+               list( $host, $lag ) = $wgLoadBalancer->getMaxLag();
+               while ( $lag > $maxLag ) {
+                       $name = @gethostbyaddr( $host );
+                       if ( $name !== false ) {
+                               $host = $name;
+                       }
+                       print "Waiting for $host (lagged $lag seconds)...\n";
+                       sleep($maxLag);
+                       list( $host, $lag ) = $wgLoadBalancer->getMaxLag();
+               }
+       }
+}
+
+
+
 ?>