rs minor

2 files changed, 6 insertions, 3 deletions

diff --git a/db/repl/rs.h b/db/repl/rs.h
index ca77759b829..d9c0b80f710 100644
--- a/db/repl/rs.h
+++ b/db/repl/rs.h
@@ -268,7 +268,8 @@ namespace mongo {
                 _hbmsg[sz] = 0;
                 memcpy(_hbmsg, s.c_str(), sz);
             }
-            log(logLevel) << "replSet " << s << rsLog;
+            if( !s.empty() )
+                log(logLevel) << "replSet " << s << rsLog;
         }
     protected:
         bool initFromConfig(ReplSetConfig& c); // true if ok; throws if config really bad; false if config doesn't include self
diff --git a/db/repl/rs_sync.cpp b/db/repl/rs_sync.cpp
index 2764a165e1a..672ac38a721 100644
--- a/db/repl/rs_sync.cpp
+++ b/db/repl/rs_sync.cpp
@@ -166,8 +166,10 @@ namespace mongo {
 
     void ReplSetImpl::_syncThread() {
         StateBox::SP sp = box.get();
-        if( sp.state.primary() )
+        if( sp.state.primary() ) {
+            sleepsecs(1);
             return;
+        }
 
         /* later, we can sync from up secondaries if we want. tbd. */
         if( sp.primary == 0 )
@@ -199,7 +201,7 @@ namespace mongo {
                 // TODO : SET NOT SECONDARY here.
                 sleepsecs(60);
             }
-            sleepsecs(2);
+            sleepsecs(1);
         }
     }