some log cleaning

2 files changed, 9 insertions, 6 deletions

diff --git a/db/client.cpp b/db/client.cpp
index 5be217cf358..f1d6bf6bfcd 100644
--- a/db/client.cpp
+++ b/db/client.cpp
@@ -56,9 +56,9 @@ namespace mongo {
         _god = 0;
 
         if ( _context )
-            cout << "ERROR: Client::~Client _context should be NULL: " << _desc << endl;
+            error() << "Client::~Client _context should be NULL: " << _desc << endl;
         if ( !_shutdown ) 
-            cout << "ERROR: Client::shutdown not called: " << _desc << endl;
+            error() << "Client::shutdown not called: " << _desc << endl;
     }
 
     void Client::_dropns( const string& ns ){
@@ -75,7 +75,7 @@ namespace mongo {
             dropCollection( ns , err , b );
         }
         catch ( ... ){
-            log() << "error dropping temp collection: " << ns << endl;
+            warning() << "couldn't dropping temp collection: " << ns << endl;
         }
 
     }
diff --git a/util/log.h b/util/log.h
index 1f11c81cff5..e0147a02761 100644
--- a/util/log.h
+++ b/util/log.h
@@ -295,10 +295,13 @@ namespace mongo {
     inline Nullstream& log() {
         return Logstream::get().prolog();
     }
+    
+    inline Nullstream& error() {
+        return log( LL_ERROR );
+    }
 
-    /* TODOCONCURRENCY */
-    inline ostream& stdcout() {
-        return cout;
+    inline Nullstream& warning() {
+        return log( LL_WARNING );
     }
 
     /* default impl returns "" -- mongod overrides */