Merge branch 'master' of ssh://git.10gen.com/data/gitroot/p

2 files changed, 8 insertions, 1 deletions

diff --git a/db/db.cpp b/db/db.cpp
index 52d77deddaf..3d693a2cbdf 100644
--- a/db/db.cpp
+++ b/db/db.cpp
@@ -432,7 +432,7 @@ void connThread()
 					cout << curTimeMillis() % 10000 << "   end msg" << endl;

 					dbMsgPort.shutdown();

 					sleepmillis(500);

-					exit(1);

+					exit(EXIT_SUCCESS);

 				}

 			}

 			else if( m.data->operation == dbQuery ) { 

@@ -569,8 +569,14 @@ void initAndListen(int listenPort, const char *dbPath) {
     listen(listenPort);    

 }

 

+void sigHandler( int signal ) {

+  psignal( signal, "Signal Received : ");

+}  /*handler*/

+

 int main(int argc, char* argv[], char *envp[] )

 {

+    signal(SIGPIPE, sigHandler);

+

 	srand(curTimeMillis());

 

 	if( argc >= 2 ) {

diff --git a/stdafx.h b/stdafx.h
index b3f78fb0310..567f37be5b5 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -39,6 +39,7 @@ void wasserted(const char *msg, const char *file, unsigned line);
 

 #include <stdio.h>

 #include <sstream>

+#include <signal.h>

 

 typedef char _TCHAR;