0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-30 00:56:44 +01:00

Merge branch 'master' of git@github.com:mongodb/mongo

This commit is contained in:
Eliot Horowitz 2010-04-06 13:50:05 -04:00
commit 3cfeda9c91

View File

@ -465,21 +465,6 @@ namespace mongo {
server = auto_ptr<SockAddr>(new SockAddr(ip.c_str(), port)); server = auto_ptr<SockAddr>(new SockAddr(ip.c_str(), port));
p = auto_ptr<MessagingPort>(new MessagingPort()); p = auto_ptr<MessagingPort>(new MessagingPort());
#if 0
//Right now some code depends on ports to identify a connection.
//Using unix sockets breaks this code
#ifndef _WIN32
if (server->getAddr() == "127.0.0.1"){
SockAddr _server (makeUnixSockPath(port).c_str(), port);
if (p->connect(_server)){
*server = _server;
return true;
}
}
#endif
#endif
if ( !p->connect(*server) ) { if ( !p->connect(*server) ) {
stringstream ss; stringstream ss;
ss << "couldn't connect to server " << serverAddress << " " << ip << ":" << port; ss << "couldn't connect to server " << serverAddress << " " << ip << ":" << port;