--- mqtt/src/mqttd.c	2012/01/27 15:05:38	1.2
+++ mqtt/src/mqttd.c	2012/07/03 09:02:50	1.3
@@ -7,15 +7,14 @@
 
 io_enableDEBUG;
 
-sl_config cfg;
+cfg_root_t cfg;
 sessions_t Sessions;
 sched_root_task_t *root;
 sqlite3 *acc, *pub;
-pthread_mutex_t mtx_sess, mtx_pub;
 FILE *logg;
 extern char compiled[], compiledby[], compilehost[];
 static char szCfgName[MAXPATHLEN];
-intptr_t Kill;
+volatile intptr_t Kill;
 
 
 static void
@@ -37,13 +36,14 @@ sigHand(int sig)
 
 	switch (sig) {
 		case SIGHUP:
-			UnloadConfig(&cfg);
-			if (!LoadConfig(szCfgName, &cfg)) {
+			cfgUnloadConfig(&cfg);
+			if (!cfgLoadConfig(szCfgName, &cfg)) {
 				ioDEBUG(1, "Config reload OK!");
 				break;
 			}
 
-			syslog(LOG_ERR, "Error:: can't reload #%d - %s", cfg_GetErrno(), cfg_GetError());
+			ioLIBERR(cfg);
+		case SIGINT:
 		case SIGTERM:
 			ioDEBUG(1, "Terminate MQTT service in progress");
 			Kill++;
@@ -60,11 +60,12 @@ sigHand(int sig)
 int
 main(int argc, char **argv)
 {
-	char ch, batch = 0, szStr[STRSIZ];
+	char ch, batch = 0;
 	register int i;
 	int sock = -1, ret = 0;
 	struct passwd *pass;
 	struct sigaction sa;
+	ait_val_t v;
 
 	TAILQ_INIT(&Sessions);
 
@@ -88,22 +89,20 @@ main(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
-	if (LoadConfig(szCfgName, &cfg)) {
+	if (cfgLoadConfig(szCfgName, &cfg)) {
 		printf("Error:: can't load #%d - %s\n", cfg_GetErrno(), cfg_GetError());
 		return 1;
 	}
-	pthread_mutex_init(&mtx_sess, NULL);
-	pthread_mutex_init(&mtx_pub, NULL);
 	openlog("mqttd", LOG_PID | LOG_CONS, LOG_DAEMON);
+	/* load 3 plugins */
 	for (i = 0; i < 3; i++)
 		if (!mqttLoadRTLM(&cfg, i)) {
 			printf("Error:: Can't load RTL module\n");
-			while (i--)
-				mqttUnloadRTLM(i);
-			UnloadConfig(&cfg);
+			mqttUnloadRTLM(acc);
+			mqttUnloadRTLM(pub);
+			mqttUnloadRTLM(logg);
+			cfgUnloadConfig(&cfg);
 			closelog();
-			pthread_mutex_destroy(&mtx_pub);
-			pthread_mutex_destroy(&mtx_sess);
 			return 2;
 		}
 	acc = call.OpenACC(&cfg);
@@ -122,6 +121,7 @@ main(int argc, char **argv)
 		goto end;
 	}
 
+
 	if (mqttMkDir(&cfg)) {
 		printf("Error:: in statedir #%d - %s\n", errno, strerror(errno));
 		ret = 3;
@@ -153,24 +153,26 @@ main(int argc, char **argv)
 				goto end;
 		}
 	else
-		ioVERBOSE(1) printf("Start service in batch mode ...\n");
+		ioDEBUG(1, "Start service in batch mode ...");
 
 	memset(&sa, 0, sizeof sa);
 	sigemptyset(&sa.sa_mask);
 	sa.sa_handler = sigHand;
 	sigaction(SIGHUP, &sa, NULL);
+	sigaction(SIGINT, &sa, NULL);
 	sigaction(SIGTERM, &sa, NULL);
 	sigaction(SIGCHLD, &sa, NULL);
 	sigaction(SIGPIPE, &sa, NULL);
-	ioDEBUG(2, "Service is ready for start engine ...");
+	ioDEBUG(2, "Service is ready for starting 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);
+	cfg_loadAttribute(&cfg, "mqttd", "user", &v, MQTT_USER);
+	pass = getpwnam(AIT_GET_STR(&v));
+	AIT_FREE_VAL(&v);
 	if (pass) {
 		setgid(pass->pw_gid);
 		setuid(pass->pw_uid);
@@ -178,24 +180,24 @@ main(int argc, char **argv)
 	}
 
 	if (!(root = schedBegin())) {
-		printf("Error:: scheduler #%d - %s\n", sched_GetErrno(), sched_GetError());
+		ioLIBERR(sched);
 		ret = 6;
 		goto end;
 	}
 
+	/* go catch the cat ... */
 	Run(sock);
 
 	schedEnd(&root);
-end:
+end:	/* free all resources */
 	srv_Close(sock);
 	call.CloseLOG(logg);
 	call.ClosePUB(pub);
 	call.CloseACC(acc);
-	for (i = 0; i < 3; i++)
-		mqttUnloadRTLM(i);
+	mqttUnloadRTLM(acc);
+	mqttUnloadRTLM(pub);
+	mqttUnloadRTLM(logg);
+	cfgUnloadConfig(&cfg);
 	closelog();
-	UnloadConfig(&cfg);
-	pthread_mutex_destroy(&mtx_pub);
-	pthread_mutex_destroy(&mtx_sess);
 	return ret;
 }