--- mqtt/src/mqttd.c	2011/12/01 00:10:18	1.1.1.1.2.7
+++ mqtt/src/mqttd.c	2011/12/09 09:53:54	1.1.1.1.2.10
@@ -1,13 +1,16 @@
 #include "global.h"
+#include "mqttd.h"
 #include "rtlm.h"
 #include "utils.h"
 #include "daemon.h"
 
 
 sl_config cfg;
+sessions_t Sessions;
 sched_root_task_t *root;
 extern char compiled[], compiledby[], compilehost[];
-int Verbose;
+static char szCfgName[MAXPATHLEN];
+int Verbose, Kill;
 
 
 static void
@@ -22,17 +25,44 @@ Usage(void)
 		compiledby, compilehost, compiled);
 }
 
+static void
+sigHand(int sig)
+{
+	int stat;
 
+	switch (sig) {
+		case SIGHUP:
+			UnloadConfig(&cfg);
+			if (!LoadConfig(szCfgName, &cfg)) {
+				VERB(1) syslog(LOG_DEBUG, "Config reload OK!");
+				break;
+			}
+
+			syslog(LOG_ERR, "Error:: can't reload #%d - %s", cfg_GetErrno(), cfg_GetError());
+		case SIGTERM:
+			VERB(1) syslog(LOG_DEBUG, "Terminate MQTT service in progress");
+			Kill++;
+			break;
+		case SIGCHLD:
+			while (waitpid(-1, &stat, WNOHANG) > 0);
+			break;
+	}
+}
+
+
 int
 main(int argc, char **argv)
 {
-	char ch, batch = 0, szStr[STRSIZ], szCfgName[MAXPATHLEN];
+	char ch, batch = 0, szStr[STRSIZ];
 	register int i;
 	sqlite3 *acc = NULL, *pub = NULL;
 	FILE *logg = NULL;
 	int sock = -1, ret = 0;
 	struct passwd *pass;
+	struct sigaction sa;
 
+	TAILQ_INIT(&Sessions);
+
 	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
 	while ((ch = getopt(argc, argv, "hvbc:")) != -1)
 		switch (ch) {
@@ -89,13 +119,13 @@ main(int argc, char **argv)
 		goto end;
 	}
 
-	VERB(2) syslog(LOG_DEBUG, "Service is ready for start engine ...");
+	memset(&sa, 0, sizeof sa);
+	sigemptyset(&sa.sa_mask);
+	sa.sa_handler = sigHand;
+	sigaction(SIGHUP, &sa, NULL);
+	sigaction(SIGTERM, &sa, NULL);
+	sigaction(SIGCHLD, &sa, NULL);
 
-	if ((sock = srv_Socket(&cfg)) == -1) {
-		ret = 4;
-		goto end;
-	}
-
 	if (!batch)
 		switch (fork()) {
 			case -1:
@@ -104,15 +134,7 @@ main(int argc, char **argv)
 				goto end;
 			case 0:
 				setsid();
-				cfg_LoadAttribute(&cfg, CFG("mqttd"), CFG("user"), CFG(szStr), 
-						sizeof szStr, MQTT_USER);
-				pass = getpwnam(szStr);
-				if (pass) {
-					setgid(pass->pw_gid);
-					setuid(pass->pw_uid);
-					VERB(1) syslog(LOG_WARNING, "Try to change group #%d and user #%d", 
-							pass->pw_gid, pass->pw_uid);
-				}
+
 				ret = open("/dev/null", O_RDWR);
 				if (ret != -1) {
 					dup2(ret, STDIN_FILENO);
@@ -124,11 +146,27 @@ main(int argc, char **argv)
 				break;
 			default:
 				VERB(2) syslog(LOG_DEBUG, "MQTT service go to shadow land ...");
+				sleep(1);
 				ret = 0;
 				goto end;
 		}
 	else
 		VERB(1) printf("Start service in batch mode ...\n");
+
+	VERB(2) syslog(LOG_DEBUG, "Service is ready for start engine ...");
+
+	if ((sock = srv_Socket(&cfg)) == -1) {
+		ret = 4;
+		goto end;
+	}
+
+	cfg_LoadAttribute(&cfg, CFG("mqttd"), CFG("user"), CFG(szStr), sizeof szStr, MQTT_USER);
+	pass = getpwnam(szStr);
+	if (pass) {
+		setgid(pass->pw_gid);
+		setuid(pass->pw_uid);
+		VERB(1) syslog(LOG_WARNING, "Try to change group #%d and user #%d", pass->pw_gid, pass->pw_uid);
+	}
 
 	if (!(root = schedBegin())) {
 		printf("Error:: scheduler #%d - %s\n", sched_GetErrno(), sched_GetError());