slightly confusing rs error message

2 files changed, 5 insertions, 2 deletions

diff --git a/db/repl/rs.cpp b/db/repl/rs.cpp
index ac6ad20fd29..2dd73cc9488 100644
--- a/db/repl/rs.cpp
+++ b/db/repl/rs.cpp
@@ -160,7 +160,7 @@ namespace mongo {
                 catch(...) {
                     uassert(13114, "bad --replSet seed hostname", false);
                 }
-                uassert(13096, "bad --replSet config string - dups?", seedSet.count(m) == 0 );
+                uassert(13096, "bad --replSet command line config string - dups?", seedSet.count(m) == 0 );
                 seedSet.insert(m);
                 //uassert(13101, "can't use localhost in replset host list", !m.isLocalHost());
                 if( m.isSelf() ) {
diff --git a/db/repl/rs_config.cpp b/db/repl/rs_config.cpp
index 9602d8be229..52614b89db1 100644
--- a/db/repl/rs_config.cpp
+++ b/db/repl/rs_config.cpp
@@ -223,7 +223,10 @@ namespace mongo {
                 ss << "replSet members[" << i << "] bad config object";
                 uassert(13135, ss.str(), false);
             }
-            uassert(13108, "bad " + rsConfigNs + " config dups?", ords.count(m._id) == 0 && hosts.count(m.h.toString()) == 0);
+            if( !(ords.count(m._id) == 0 && hosts.count(m.h.toString()) == 0) ) {
+                log() << "replSet " << o.toString() << rsLog;
+                uassert(13108, "bad replset config -- duplicate hosts in the config object?", false);
+            }
             hosts.insert(m.h.toString());
             ords.insert(m._id);
             this->members.push_back(m);