summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/oplogreader.cpp
diff options
context:
space:
mode:
authorEric Milkie <milkie@10gen.com>2014-08-29 16:34:24 -0400
committerEric Milkie <milkie@10gen.com>2014-08-29 17:17:00 -0400
commit0fbd416c565ec4af11990e64cab887af12fbf76f (patch)
tree2787feb1a82b00469c60de37a28767f806d06742 /src/mongo/db/repl/oplogreader.cpp
parent746e8835b0b841235b767628d6ae0382a85bdab0 (diff)
downloadmongo-0fbd416c565ec4af11990e64cab887af12fbf76f.tar.gz
SERVER-15089 oplogreader use HostAndPort to connect instead of strings
Diffstat (limited to 'src/mongo/db/repl/oplogreader.cpp')
-rw-r--r--src/mongo/db/repl/oplogreader.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/db/repl/oplogreader.cpp b/src/mongo/db/repl/oplogreader.cpp
index 5037438b6f3..acb2eb71d7d 100644
--- a/src/mongo/db/repl/oplogreader.cpp
+++ b/src/mongo/db/repl/oplogreader.cpp
@@ -98,13 +98,13 @@ namespace repl {
readersCreatedStats.increment();
}
- bool OplogReader::commonConnect(const string& hostName) {
+ bool OplogReader::commonConnect(const HostAndPort& host) {
if( conn() == 0 ) {
_conn = shared_ptr<DBClientConnection>(new DBClientConnection(false,
0,
tcp_timeout));
string errmsg;
- if ( !_conn->connect(hostName.c_str(), errmsg) ||
+ if ( !_conn->connect(host, errmsg) ||
(getGlobalAuthorizationManager()->isAuthEnabled() &&
!replAuthenticate(_conn.get())) ) {
@@ -116,24 +116,24 @@ namespace repl {
return true;
}
- bool OplogReader::connect(const std::string& hostName) {
+ bool OplogReader::connect(const HostAndPort& host) {
if (conn()) {
return true;
}
- if (!commonConnect(hostName)) {
+ if (!commonConnect(host)) {
return false;
}
return true;
}
- bool OplogReader::connect(const std::string& hostName, const OID& myRID) {
+ bool OplogReader::connect(const HostAndPort& host, const OID& myRID) {
if (conn()) {
return true;
}
- if (!commonConnect(hostName)) {
+ if (!commonConnect(host)) {
return false;
}
@@ -144,12 +144,12 @@ namespace repl {
return true;
}
- bool OplogReader::connect(const mongo::OID& rid, const int from, const string& to) {
+ bool OplogReader::connect(const mongo::OID& rid, const int from, const HostAndPort& to) {
if (conn() != 0) {
return true;
}
if (commonConnect(to)) {
- log() << "handshake between " << from << " and " << to << endl;
+ log() << "handshake between " << from << " and " << to.toString() << endl;
return passthroughHandshake(rid, from);
}
return false;