indicate in shell prompt when connected to a configsvr.

hghazal · Sep 20, 2011 · 7399d40 · 7399d40
1 parent b67fee1
commit 7399d40
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/db/repl/rs.h b/db/repl/rs.h
@@ -590,6 +590,9 @@ namespace mongo {
         bool check(string& errmsg, BSONObjBuilder& result) {
             if( !replSet ) {
                 errmsg = "not running with --replSet";
+                if( cmdLine.configsvr ) { 
+                    result.append("info", "configsvr"); // for shell prompt
+                }
                 return false;
             }
 

diff --git a/shell/dbshell.cpp b/shell/dbshell.cpp
@@ -549,8 +549,10 @@ string sayReplSetMemberState() {
                 MemberState ms(s);
                 return ms.toString();
             }
-            else if( str::equals(info.getStringField("info"), "mongos") ) { 
-                return "mongos";
+            else {
+                string s = info.getStringField("info");
+                if( s.size() < 20 )
+                    return s; // "mongos", "configsvr"
             }
         }
     }

diff --git a/shell/mongo_vstudio.cpp b/shell/mongo_vstudio.cpp
@@ -1673,7 +1673,8 @@ const StringData _jscode_raw_utils =
 "else if (x == \"\") {\n" 
 "print(\"\\t\" + \"db.help()                    help on db methods\");\n" 
 "print(\"\\t\" + \"db.mycoll.help()             help on collection methods\");\n" 
-"print(\"\\t\" + \"rs.help()                    help on replica set methods\");\n" 
+"print(\"\\t\" + \"sh.help()                    sharding helpers\");\n" 
+"print(\"\\t\" + \"rs.help()                    replica set helpers\");\n" 
 "print(\"\\t\" + \"help admin                   administrative help\");\n" 
 "print(\"\\t\" + \"help connect                 connecting to a db help\");\n" 
 "print(\"\\t\" + \"help keys                    key shortcuts\");\n"