summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2010-07-01 10:22:40 -0400
committerEliot Horowitz <eliot@10gen.com>2010-07-01 10:22:40 -0400
commiteb9efb78c7e94de6a6b0d3f6b131335e10922bc4 (patch)
treec4e47b652be66131a8ea747003128e9408c6143f
parent3ef75220fcb41f767a1868cf12a91baf975ff7e2 (diff)
downloadmongo-eb9efb78c7e94de6a6b0d3f6b131335e10922bc4.tar.gz
masterConn in DBClientPaired
Conflicts: client/dbclient.h
-rw-r--r--client/dbclient.cpp4
-rw-r--r--client/dbclient.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/client/dbclient.cpp b/client/dbclient.cpp
index f617f7cbbbb..109a19bee2b 100644
--- a/client/dbclient.cpp
+++ b/client/dbclient.cpp
@@ -932,6 +932,10 @@ namespace mongo {
return master == Left ? left : right;
}
+ DBClientConnection& DBClientPaired::masterConn(){
+ return checkMaster();
+ }
+
DBClientConnection& DBClientPaired::slaveConn(){
DBClientConnection& m = checkMaster();
assert( ! m.isFailed() );
diff --git a/client/dbclient.h b/client/dbclient.h
index a2fad8e260d..c01465026a5 100644
--- a/client/dbclient.h
+++ b/client/dbclient.h
@@ -909,6 +909,7 @@ namespace mongo {
return left.getServerAddress() + "," + right.getServerAddress();
}
+ DBClientConnection& masterConn();
DBClientConnection& slaveConn();
/* TODO - not yet implemented. mongos may need these. */