--- smsdaemon/daemon.cpp	2008/12/08 11:30:07	152
+++ smsdaemon/daemon.cpp	2008/12/08 21:49:49	158
@@ -1,5 +1,5 @@
 #include <iostream>
-
+#include <sstream>
 #include <signal.h>
 #include <fcntl.h>
 #include <stdlib.h>
@@ -12,7 +12,8 @@
 
 #include "ConfigFile.h"
 #include "daemon.h"
-#include "common.h"
+#include "Common.h"
+#include "Logger.h"
 
 
 
@@ -24,13 +25,18 @@
 	switch (sig)
 	{
 	case SIGHUP:
-		Common::instance()->logMessage("hangup signal catched");
+		Logger::logMessage("hangup signal catched");
 		break;
 
 	case SIGTERM:
-		Common::instance()->logMessage("terminate signal catched...exiting");
+		Logger::logMessage("terminate signal catched...exiting");
 		Common::instance()->mainContinue = false;
 		break;
+	default:
+		std::stringstream ss;
+		ss << "Received unknown signal: " << sig;
+		Logger::logMessage(ss.str());
+		break;
 	}
 }
 
@@ -48,10 +54,11 @@
 	}
 	else
 	{
-		cmn->logMessage( string("could not lookup userid: ") + userstr );
+		Logger::logMessage( string("could not lookup userid: ") + userstr );
 		exit(1);
 	}
 
+
 	group* grp = getgrnam(groupstr.c_str() );
 	if (grp != 0)
 	{
@@ -59,7 +66,7 @@
 	}
 	else
 	{
-		cmn->logMessage( string("could not lookup groupid: ") + groupstr );
+		Logger::logMessage( string("could not lookup groupid: ") + groupstr );
 		exit(1);
 	}
 }
@@ -123,6 +130,8 @@
 	signal(SIGTTIN, SIG_IGN);
 	signal(SIGHUP, signal_handler); /* catch hangup signal */
 	signal(SIGTERM, signal_handler); /* catch kill signal */
+	signal(SIGINT, signal_handler); /* keyboard interrupt */
+	signal(SIGQUIT, signal_handler); /* QUIT */
 
 	/*this program is now a daemon*/
 	setegid( cmn->gid );