tweaks

guanqun · Apr 23, 2010 · 1d908a2 · 1d908a2
1 parent 1d7e798
commit 1d908a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/db/db.sln b/db/db.sln
@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongod", "db.vcproj", "{215B2D68-0A70-4D10-8E75-B31010C62A91}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{4082881B-EB00-486F-906C-843B8EC06E18}"
+	ProjectSection(SolutionItems) = preProject
+		driverHelpers.cpp = driverHelpers.cpp
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dbtests", "dbtests", "{C72EBEDD-342D-4371-8B0D-D7505902FA69}"
 EndProject
@@ -12,7 +15,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2B262D59-9DC7-4BF1-A431-1BD4966899A5}"
 	ProjectSection(SolutionItems) = preProject
 		..\tools\bridge.cpp = ..\tools\bridge.cpp
-		driverHelpers.cpp = driverHelpers.cpp
 		..\tools\sniffer.cpp = ..\tools\sniffer.cpp
 	EndProjectSection
 EndProject

diff --git a/db/dbwebserver.cpp b/db/dbwebserver.cpp
@@ -93,14 +93,14 @@ namespace mongo {
             if( ClientCursor::byLocSize()>500 )
                 ss << bold(ClientCursor::byLocSize()>10000) << "Cursors byLoc.size(): " << ClientCursor::byLocSize() << bold() << '\n';
 
-            ss << "\n<b>replication</b>\n";
+            ss << "\nreplication: ";
             if( *replInfo )
                 ss << "\nreplInfo:  " << replInfo << "\n\n";
             if( replSet ) {
                 ss << "<a title=\"see replSetGetStatus link top of page\">--replSet mode</a>\n";
             }
             else {
-                ss << "master: " << replSettings.master << '\n';
+                ss << "\nmaster: " << replSettings.master << '\n';
                 ss << "slave:  " << replSettings.slave << '\n';
                 if ( replPair ) {
                     ss << "replpair:\n";
@@ -192,7 +192,6 @@ namespace mongo {
             ss << "<a "
                 << "href=\"http://www.mongodb.org/pages/viewpage.action?pageId=7209296\""
                 << "title=\"snapshot: was the db in the write lock when this page was generated?\">";
-            ss << "write locked:</a> " << (dbMutex.info().isLocked() ? "true" : "false") << "\n";
             ss << "uptime: " << time(0)-started << " seconds\n";
             if ( replAllDead )
                 ss << "<b>replication replAllDead=" << replAllDead << "</b>\n";
@@ -457,13 +456,15 @@ namespace mongo {
             ss << "<a "
                 "title=\"click for documentation on this http interface\""
                 "href=\"http://www.mongodb.org/display/DOCS/Http+Interface\">HTTP</a> admin port:" << _port << "\n";
+
             doUnlockedStuff(ss);
 
+            ss << "write locked:</a> " << (dbMutex.info().isLocked() ? "true" : "false") << "\n";
             {
                 Timer t;
                 readlocktry lk( "" , 2000 );
                 if ( lk.got() ){
-                    ss << "time to get dblock: " << t.millis() << "ms\n";
+                    ss << "time to get readlock: " << t.millis() << "ms\n";
                     doLockedStuff(ss);
                 }
                 else {