make lognoquiet and make --quit not print connect/disconnect

2 files changed, 10 insertions, 1 deletions

diff --git a/util/log.h b/util/log.h
index 5f8d7589f87..58d43117eeb 100644
--- a/util/log.h
+++ b/util/log.h
@@ -20,6 +20,8 @@
 
 namespace mongo {
 
+    extern bool quiet;
+
     // Utility interface for stringifying object only when val() called.
     class LazyString {
     public:
@@ -182,8 +184,15 @@ namespace mongo {
         return logstream.prolog();
     }
 
+    inline Nullstream& lognoquiet(){
+        if ( quiet )
+            return nullstream;
+        return log();
+    }
+
     inline ostream& stdcout() {
         return cout;
     }
 
+
 } // namespace mongo
diff --git a/util/message.cpp b/util/message.cpp
index 533617cd6ff..f560508dae3 100644
--- a/util/message.cpp
+++ b/util/message.cpp
@@ -83,7 +83,7 @@ namespace mongo {
                 continue;
             }
             disableNagle(s);
-            log() << "connection accepted from " << from.toString() << endl;
+            lognoquiet() << "connection accepted from " << from.toString() << endl;
             accepted( new MessagingPort(s, from) );
         }
     }