MediaWiki 1.17.0

[autoinstalls/mediawiki.git] / maintenance / mcc.php

diff --git a/maintenance/mcc.php b/maintenance/mcc.php
index 53645df825e5a316a073e1fd5ebeaf4b31da35c5..a8c79a7259978023bb662fe5aa82819cca2a79e3 100644 (file)
--- a/maintenance/mcc.php
+++ b/maintenance/mcc.php
@@ -8,64 +8,37 @@
  */
 
 /** */
-require_once( 'commandLine.inc' );
+require_once( dirname( __FILE__ ) . '/commandLine.inc' );
 
-$mcc = new memcached( array('persistant' => true/*, 'debug' => true*/) );
+$mcc = new MWMemcached( array( 'persistant' => true/*, 'debug' => true*/ ) );
 $mcc->set_servers( $wgMemCachedServers );
-#$mcc->set_debug( true );
-
-function mccShowHelp($command) {
-
-       if(! $command ) { $command = 'fullhelp'; }
-       $onlyone = true;
-
-       switch ( $command ) {
-
-               case 'fullhelp':
-                       // will show help for all commands
-                       $onlyone = false;
-
-               case 'get':
-                       print "get: grabs something\n";
-               if($onlyone) { break; }
-
-               case 'getsock':
-                       print "getsock: lists sockets\n";
-               if($onlyone) { break; }
-
-               case 'set':
-                       print "set: changes something\n";
-               if($onlyone) { break; }
-
-               case 'delete':
-                       print "delete: deletes something\n";
-               if($onlyone) { break; }
-
-               case 'history':
-                       print "history: show command line history\n";
-               if($onlyone) { break; }
-
-               case 'server':
-                       print "server: show current memcached server\n";
-               if($onlyone) { break; }
-
-               case 'dumpmcc':
-                       print "dumpmcc: shows the whole thing\n";
-               if($onlyone) { break; }
-
-               case 'exit':
-               case 'quit':
-                       print "exit or quit: exit mcc\n";
-               if($onlyone) { break; }
-
-               case 'help':
-                       print "help: help about a command\n";
-               if($onlyone) { break; }
-
-               default:
-                       if($onlyone) {
-                               print "$command: command does not exist or no help for it\n";
-                       }
+# $mcc->set_debug( true );
+
+function mccShowHelp( $command ) {
+       $commandList = array(
+               'get' => 'grabs something',
+               'getsock' => 'lists sockets',
+               'set' => 'changes something',
+               'delete' => 'deletes something',
+               'history' => 'show command line history',
+               'server' => 'show current memcached server',
+               'dumpmcc' => 'shows the whole thing',
+               'exit' => 'exit mcc',
+               'quit' => 'exit mcc',
+               'help' => 'help about a command',
+       );
+       if ( !$command ) {
+               $command = 'fullhelp';
+       }
+       if ( $command === 'fullhelp' ) {
+               $max_cmd_len = max( array_map( 'strlen', array_keys( $commandList ) ) );
+               foreach ( $commandList as $cmd => $desc ) {
+                       printf( "%-{$max_cmd_len}s: %s\n", $cmd, $desc );
+               }
+       } elseif ( isset( $commandList[$command] ) ) {
+               print "$command: $commandList[$command]\n";
+       } else {
+               print "$command: command does not exist or no help for it\n";
        }
 }
 
@@ -74,8 +47,8 @@ do {
        $showhelp = false;
        $quit = false;
 
-       $line = readconsole( '> ' );
-       if ($line === false) exit;
+       $line = Maintenance::readconsole();
+       if ( $line === false ) exit;
 
        $args = explode( ' ', $line );
        $command = array_shift( $args );
@@ -84,7 +57,7 @@ do {
        switch ( $command ) {
                case 'help':
                        // show an help message
-                       mccShowHelp(array_shift($args));
+                       mccShowHelp( array_shift( $args ) );
                break;
 
                case 'get':
@@ -98,7 +71,7 @@ do {
                                $res = $res[$args[1]];
                        }
                        if ( $res === false ) {
-                               #print 'Error: ' . $mcc->error_string() . "\n";
+                               # print 'Error: ' . $mcc->error_string() . "\n";
                                print "MemCached error\n";
                        } elseif ( is_string( $res ) ) {
                                print "$res\n";
@@ -114,6 +87,10 @@ do {
                        break;
 
                case 'server':
+                       if ( $mcc->_single_sock !== null ) {
+                               print $mcc->_single_sock . "\n";
+                               break;
+                       }
                        $res = $mcc->get( $args[0] );
                        $hv = $mcc->_hashfunc( $args[0] );
                        for ( $i = 0; $i < 3; $i++ ) {
@@ -130,7 +107,7 @@ do {
                                $value = implode( ' ', $args );
                        }
                        if ( !$mcc->set( $key, $value, 0 ) ) {
-                               #print 'Error: ' . $mcc->error_string() . "\n";
+                               # print 'Error: ' . $mcc->error_string() . "\n";
                                print "MemCached error\n";
                        }
                        break;
@@ -138,14 +115,14 @@ do {
                case 'delete':
                        $key = implode( ' ', $args );
                        if ( !$mcc->delete( $key ) ) {
-                               #print 'Error: ' . $mcc->error_string() . "\n";
+                               # print 'Error: ' . $mcc->error_string() . "\n";
                                print "MemCached error\n";
                        }
                        break;
 
                case 'history':
                        if ( function_exists( 'readline_list_history' ) ) {
-                               foreach( readline_list_history() as $num => $line) {
+                               foreach ( readline_list_history() as $num => $line ) {
                                        print "$num: $line\n";
                                }
                        } else {
@@ -176,5 +153,3 @@ do {
                }
        }
 } while ( !$quit );
-
-