some public accessors

mongodb · Feb 12, 2011 · f4f7cec · f4f7cec
1 parent 0196f01
commit f4f7cec
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/client/dbclient.h b/client/dbclient.h
@@ -120,6 +120,10 @@ namespace mongo {
     public:
         enum ConnectionType { INVALID , MASTER , PAIR , SET , SYNC };
 
+        ConnectionString() {
+            _type = INVALID;
+        }
+
         ConnectionString( const HostAndPort& server ) {
             _type = MASTER;
             _servers.push_back( server );
@@ -163,30 +167,22 @@ namespace mongo {
 
         bool isValid() const { return _type != INVALID; }
 
-        string toString() const {
-            return _string;
-        }
-
+        string toString() const { return _string; }
+
         DBClientBase* connect( string& errmsg ) const;
 
-        string getSetName() const {
-            return _setName;
-        }
+        string getSetName() const { return _setName; }
 
-        vector<HostAndPort> getServers() const {
-            return _servers;
-        }
+        vector<HostAndPort> getServers() const { return _servers; }
+
+        ConnectionType type() const { return _type; }
 
         static ConnectionString parse( const string& url , string& errmsg );
 
         static string typeToString( ConnectionType type );
 
     private:
 
-        ConnectionString() {
-            _type = INVALID;
-        }
-
         void _fillServers( string s ) {
             string::size_type idx;
             while ( ( idx = s.find( ',' ) ) != string::npos ) {

diff --git a/client/dbclient_rs.cpp b/client/dbclient_rs.cpp
@@ -120,7 +120,7 @@ namespace mongo {
         massert( 13610 , "ConfigChangeHook already specified" , _hook == 0 );
         _hook = hook;
     }
-
+    
     string ReplicaSetMonitor::getServerAddress() const {
         StringBuilder ss;
         if ( _name.size() )
@@ -137,6 +137,16 @@ namespace mongo {
         return ss.str();
     }
 
+    bool ReplicaSetMonitor::contains( const string& server ) const {
+        scoped_lock lk( _lock );
+        for ( unsigned i=0; i<_nodes.size(); i++ ) {
+            if ( _nodes[i].addr == server )
+                return true;
+        }
+        return false;
+    }
+
+
     void ReplicaSetMonitor::notifyFailure( const HostAndPort& server ) {
         if ( _master >= 0 ) {
             scoped_lock lk( _lock );

diff --git a/client/dbclient_rs.h b/client/dbclient_rs.h
@@ -86,6 +86,8 @@ namespace mongo {
         string getName() const { return _name; }
 
         string getServerAddress() const;
+
+        bool contains( const string& server ) const;
 
     private:
         /**