X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2Fmcc.php;h=1a063f2363f17e4b80aebf19b139f12e1f47a281;hb=9f6bb34d4135617cee9f7acfe1127a91d057a4f8;hp=66fe6664a98b2de3277e1d75d2f7482ba5886bd3;hpb=bc2120f9c0613885becfe532ad3ad341d13e492c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/mcc.php b/maintenance/mcc.php
index 66fe6664a9..1a063f2363 100755
--- a/maintenance/mcc.php
+++ b/maintenance/mcc.php
@@ -1,10 +1,18 @@
 <?php
-include_once( "../includes/DefaultSettings.php" );
-include_once( "../LocalSettings.php" );
-include_once( "../includes/MemCachedClient.inc.php" );
+/**
+ * memcached diagnostic tool
+ *
+ * @todo document
+ * @package MediaWiki
+ * @subpackage Maintenance
+ */
 
-$mcc = new MemCachedClient();
+/** */
+require_once( "commandLine.inc" );
+
+$mcc = new memcached( array('persistant' => true) );
 $mcc->set_servers( $wgMemCachedServers );
+$mcc->set_debug( true );
 
 do {
 	$bad = false;
@@ -20,13 +28,19 @@ 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";
 			} else {
 				var_dump( $res );
 			}
 			break;
+		case "getsock":
+			$res = $mcc->get( $args[0] );
+			$sock = $mcc->get_sock( $args[0] );
+			var_dump( $sock );
+			break;
 		case "set":
 			$key = array_shift( $args );
 			if ( $args[0] == "#" && is_numeric( $args[1] ) ) {
@@ -35,16 +49,22 @@ 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;
 		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 "dumpmcc":
+			var_dump( $mcc );
+			break;
 		case "quit":
+		case "exit":
 			$quit = true;
 			break;
 		default:
@@ -61,19 +81,4 @@ do {
 	}
 } while ( !$quit );
 
-function readconsole( $prompt = "" ) {
-	if ( function_exists( "readline" ) ) {
-		return readline( $prompt );
-	} else {
-		print $prompt;
-		$fp = fopen( "php://stdin", "r" );
-		$resp = trim( fgets( $fp, 1024 ) );
-		fclose( $fp );
-		return $resp;
-	}
-}
-
-
-
 ?>
-