better hostandport

mongodb · Jul 19, 2010 · 80fbaf2 · 80fbaf2
1 parent 87f8edd
commit 80fbaf2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/db/repl/health.cpp b/db/repl/health.cpp
@@ -73,10 +73,14 @@ namespace mongo {
         bool ok = h > 0;
         s << td(h);
         s << td(ago(hbinfo().upSince));
+        bool never = false;
         {
             string h;
             time_t hb = hbinfo().lastHeartbeat;
-            if( hb == 0 ) h = "never"; 
+            if( hb == 0 ) {
+                h = "never";
+                never = true;
+            }
             else h = ago(hb) + " ago";
             s << td(h);
         }
@@ -85,7 +89,7 @@ namespace mongo {
         s << td( grey(hbinfo().lastHeartbeatMsg,!ok) );
         stringstream q;
         q << "/_replSetOplog?" << id();
-        s << td( a(q.str(), "", hbinfo().opTime.toString()) );
+        s << td( a(q.str(), "", never ? "?" : hbinfo().opTime.toString()) );
         s << _tr();
     }
 

diff --git a/db/repl/rs_sync.cpp b/db/repl/rs_sync.cpp
@@ -36,8 +36,8 @@ namespace mongo {
 
     void ReplSetImpl::syncThread() {
         while( 1 ) { 
-            try { 
-                // ...
+            try {
+                _syncThread();
             }
             catch(DBException& e) { 
                 log() << "replSet syncThread: " << e.toString() << rsLog;

diff --git a/util/hostandport.h b/util/hostandport.h
@@ -49,7 +49,17 @@ namespace mongo {
         /* uses real hostname instead of localhost */
         static HostAndPort Me();
 
-        bool operator<(const HostAndPort& r) const { return _host < r._host || (_host==r._host&&_port<r._port); }
+        bool operator<(const HostAndPort& r) const {
+            if( _host < r._host ) 
+                return true;
+            if( _host == r._host )
+                return port() < r.port();
+            return false;
+        }
+
+        bool operator==(const HostAndPort& r) const {
+            return _host == r._host && port() == r.port();
+        }
 
         /* returns true if the host/port combo identifies this process instance. */
         bool isSelf() const;
@@ -62,8 +72,8 @@ namespace mongo {
         operator string() const { return toString(); }
 
         string host() const { return _host; }
-
-        int port() const { return _port >= 0 ? _port : cmdLine.port; }
+        
+        int port() const { return _port >= 0 ? _port : CmdLine::DefaultDBPort; }
 
     private:
         // invariant (except full obj assignment):

diff --git a/util/ramlog.h b/util/ramlog.h
@@ -85,7 +85,7 @@ namespace mongo {
                     return html::green(line);
                 if( str::endsWith(s, " down\n") )
                     return html::yellow(line);
-                return html::blue(line);
+                return line; //html::blue(line);
             }
 
             return line;