Merge branch 'master' of git@github.com:mongodb/mongo

2 files changed, 19 insertions, 16 deletions

diff --git a/README b/README
index 9500fe9e031..977d993d82f 100644
--- a/README
+++ b/README
@@ -28,10 +28,11 @@ BUILDING
    $ cd ..
    $ svn co http://svn.red-bean.com/unittest/trunk/ unittest
    $ cd unittest
+   $ ./configure
    $ make
    $ sudo make install
 
-- Then use scons to build.  
+- Then use scons to build.
 
   If you want to build everything (mongod, mongo, tools, etc):
 
@@ -52,14 +53,14 @@ of GCC may not be happy.
 
 NOTES
 
-Mongo uses the 10gen appserver and the Java Virtual Machine to execute 
-user program code in the database.  This feature is optional -- if you would 
-like to run the database without these installed, run with the --nojni 
-option.  With --nojni specified, the db.eval() and $where features are no 
+Mongo uses the 10gen appserver and the Java Virtual Machine to execute
+user program code in the database.  This feature is optional -- if you would
+like to run the database without these installed, run with the --nojni
+option.  With --nojni specified, the db.eval() and $where features are no
 longer available.  You may still need JVM libraries which are statically linked.
 
-Mongo uses memory mapped files.  If built as a 32 bit executable, you will 
-not be able to work with large (multi-gigabyte) databases.  However, 32 bit 
+Mongo uses memory mapped files.  If built as a 32 bit executable, you will
+not be able to work with large (multi-gigabyte) databases.  However, 32 bit
 builds work fine with small development databases.
 
 --- WINDOWS ---
diff --git a/db/db.cpp b/db/db.cpp
index 0d0964ce2b9..44251838cde 100644
--- a/db/db.cpp
+++ b/db/db.cpp
@@ -344,6 +344,17 @@ namespace mongo {
     }
 
     void _initAndListen(int listenPort, const char *appserverLoc = null) {
+
+#if !defined(_WIN32)
+        pid_t pid = 0;
+        pid = getpid();
+#else
+        int pid=0;
+#endif
+
+        log() << "Mongo DB : starting : pid = " << pid << " port = " << port << " dbpath = " << dbpath
+              <<  " master = " << master << " slave = " << slave << endl;
+        
         stringstream ss;
         ss << "dbpath (" << dbpath << ") does not exist";
         massert( ss.str().c_str(), boost::filesystem::exists( dbpath ) );
@@ -365,15 +376,6 @@ namespace mongo {
         }
 #endif
 
-#if !defined(_WIN32)
-        pid_t pid = 0;
-        pid = getpid();
-#else
-        int pid=0;
-#endif
-
-        log() << "Mongo DB : starting : pid = " << pid << " port = " << port << " dbpath = " << dbpath
-        <<  " master = " << master << " slave = " << slave << endl;
 
 #if !defined(NOJNI)
         if ( useJNI ) {