Explicitly release lock on shutdown

1 files changed, 5 insertions, 3 deletions

diff --git a/db/db.cpp b/db/db.cpp
index 3c3356ea841..b22ee276518 100644
--- a/db/db.cpp
+++ b/db/db.cpp
@@ -52,6 +52,8 @@ namespace mongo {
     extern int ctr;
     extern int callDepth;
 
+    extern int lockFile;
+    
     void setupSignals();
     void closeAllSockets();
     void startReplication();
@@ -332,9 +334,9 @@ namespace mongo {
     void acquirePathLock() {
 #if !defined(_WIN32) and !defined(__sunos__)
         string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
-        int f = open( name.c_str(), O_RDONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO );
-        massert( "Unable to create / open lock file for dbpath: " + name, f > 0 );
-        massert( "Unable to acquire lock for dbpath: " + name, flock( f, LOCK_EX | LOCK_NB ) == 0 );
+        lockFile = open( name.c_str(), O_RDONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO );
+        massert( "Unable to create / open lock file for dbpath: " + name, lockFile > 0 );
+        massert( "Unable to acquire lock for dbpath: " + name, flock( lockFile, LOCK_EX | LOCK_NB ) == 0 );
 #endif        
     }