SERVER-13269 general log message improvements for 2.6

Author: kangas

src/mongo/db/auth/security_key.cpp

@@ -62,7 +62,7 @@ namespace mongo {
 
     bool authenticateInternalUser(DBClientWithCommands* conn){
         if (!isInternalAuthSet()) {
-            log() << "ERROR: No authentication params set for internal user" << endl;
+            log() << "ERROR: No authentication parameters set for internal user" << endl;
             return false;
         }
         try { 

src/mongo/db/catalog/index_catalog.cpp

@@ -778,7 +778,7 @@ namespace mongo {
         }
         else {
             if ( numIndexesTotal() || numSystemIndexesEntries || _entries.size() ) {
-                error() << "about to fassert - "
+                error() << "About to fassert - "
                         << " numIndexesTotal(): " << numIndexesTotal()
                         << " numSystemIndexesEntries: " << numSystemIndexesEntries
                         << " _entries.size(): " << _entries.size()

src/mongo/db/exec/collection_scan.cpp

@@ -190,7 +190,7 @@ namespace mongo {
         ++_commonStats.unyields;
         if (NULL != _iter) {
             if (!_iter->recoverFromYield()) {
-                warning() << "collection dropped during yield of collscan or state deleted";
+                warning() << "Collection dropped or state deleted during yield of CollectionScan";
                 _nsDropped = true;
             }
         }

src/mongo/db/exec/index_scan.cpp

@@ -94,7 +94,7 @@ namespace mongo {
             // Start at one key, end at another.
             Status status = _indexCursor->seek(_params.bounds.startKey);
             if (!status.isOK()) {
-                warning() << "Seek failed: " << status.toString();
+                warning() << "IndexCursor seek failed: " << status.toString();
                 _hitEnd = true;
             }
             if (!isEOF()) {

src/mongo/db/index_rebuilder.cpp

@@ -66,8 +66,8 @@ namespace mongo {
             }
             checkNS(collNames);
         }
-        catch (const DBException&) {
-            warning() << "index rebuilding did not complete" << endl;
+        catch (const DBException& e) {
+            warning() << "Index rebuilding did not complete: " << e.what() << endl;
         }
         boost::unique_lock<boost::mutex> lk(ReplSet::rss.mtx);
         ReplSet::rss.indexRebuildDone = true;

src/mongo/db/mongod_options.cpp

@@ -649,9 +649,9 @@ namespace mongo {
                     startupWarningsLog;
             }
             else if (!params.count("httpinterface")) {
-                log() << "** WARNING --jsonp is specified without --httpinterface," <<
+                log() << "** WARNING: --jsonp is specified without --httpinterface," <<
                     startupWarningsLog;
-                log() << "**         enabling http interface" << startupWarningsLog;
+                log() << "**          enabling http interface" << startupWarningsLog;
                 serverGlobalParams.isHttpInterfaceEnabled = true;
             }
             serverGlobalParams.jsonp = true;

src/mongo/db/query/index_bounds_builder.cpp

@@ -528,8 +528,8 @@ namespace mongo {
             const GeoMatchExpression* gme = static_cast<const GeoMatchExpression*>(expr);
             // Can only do this for 2dsphere.
             if (!mongoutils::str::equals("2dsphere", elt.valuestrsafe())) {
-                warning() << "Planner error trying to build geo bounds for " << elt.toString()
-                          << " index element.";
+                warning() << "Planner error, trying to build geo bounds for non-2dsphere"
+                          << " index element: "  << elt.toString() << endl;
                 verify(0);
             }
 
@@ -538,7 +538,7 @@ namespace mongo {
             *tightnessOut = IndexBoundsBuilder::INEXACT_FETCH;
         }
         else {
-            warning() << "Planner error, trying to build bounds for expr "
+            warning() << "Planner error, trying to build bounds for expression: "
                       << expr->toString() << endl;
             verify(0);
         }

src/mongo/db/storage/data_file.cpp

@@ -107,7 +107,7 @@ namespace mongo {
                       << filename << endl;
             }
             else {
-                log() << "openExisting size " << sz << " less then minimum file size expectation "
+                log() << "openExisting size " << sz << " less than minimum file size expectation "
                       << filename << endl;
                 verify(false);
             }