mqtt/src/mqttd.c - diff

Return to mqttd.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / src

Diff for /mqtt/src/mqttd.c between versions 1.2.2.3 and 1.2.2.10

version 1.2.2.3, 2012/04/15 21:48:23	version 1.2.2.10, 2012/06/26 14:51:33
Line 11 cfg_root_t cfg;	Line 11 cfg_root_t cfg;
sessions_t Sessions;	sessions_t Sessions;
sched_root_task_t *root;	sched_root_task_t *root;
sqlite3 acc, pub;	sqlite3 acc, pub;
pthread_mutex_t mtx_sess, mtx_pub;
FILE *logg;	FILE *logg;
extern char compiled[], compiledby[], compilehost[];	extern char compiled[], compiledby[], compilehost[];
static char szCfgName[MAXPATHLEN];	static char szCfgName[MAXPATHLEN];
intptr_t Kill;	volatile intptr_t Kill;


static void	static void
Line 43 sigHand(int sig)	Line 42 sigHand(int sig)
break;	break;
}	}

syslog(LOG_ERR, "Error:: can't reload #%d - %s", cfg_GetErrno(), cfg_GetError());	ioLIBERR(cfg);
	case SIGINT:
case SIGTERM:	case SIGTERM:
ioDEBUG(1, "Terminate MQTT service in progress");	ioDEBUG(1, "Terminate MQTT service in progress");
Kill++;	Kill++;
Line 93 main(int argc, char **argv)	Line 93 main(int argc, char **argv)
printf("Error:: can't load #%d - %s\n", cfg_GetErrno(), cfg_GetError());	printf("Error:: can't load #%d - %s\n", cfg_GetErrno(), cfg_GetError());
return 1;	return 1;
}	}
pthread_mutex_init(&mtx_sess, NULL);
pthread_mutex_init(&mtx_pub, NULL);
openlog("mqttd", LOG_PID \| LOG_CONS, LOG_DAEMON);	openlog("mqttd", LOG_PID \| LOG_CONS, LOG_DAEMON);
/* load 3 plugins */	/* load 3 plugins */
for (i = 0; i < 3; i++)	for (i = 0; i < 3; i++)
if (!mqttLoadRTLM(&cfg, i)) {	if (!mqttLoadRTLM(&cfg, i)) {
printf("Error:: Can't load RTL module\n");	printf("Error:: Can't load RTL module\n");
while (i--)	mqttUnloadRTLM(acc);
mqttUnloadRTLM(i);	mqttUnloadRTLM(pub);
	mqttUnloadRTLM(logg);
cfgUnloadConfig(&cfg);	cfgUnloadConfig(&cfg);
closelog();	closelog();
pthread_mutex_destroy(&mtx_pub);
pthread_mutex_destroy(&mtx_sess);
return 2;	return 2;
}	}
acc = call.OpenACC(&cfg);	acc = call.OpenACC(&cfg);
Line 124 main(int argc, char **argv)	Line 121 main(int argc, char **argv)
goto end;	goto end;
}	}


if (mqttMkDir(&cfg)) {	if (mqttMkDir(&cfg)) {
printf("Error:: in statedir #%d - %s\n", errno, strerror(errno));	printf("Error:: in statedir #%d - %s\n", errno, strerror(errno));
ret = 3;	ret = 3;
Line 161 main(int argc, char **argv)	Line 159 main(int argc, char **argv)
sigemptyset(&sa.sa_mask);	sigemptyset(&sa.sa_mask);
sa.sa_handler = sigHand;	sa.sa_handler = sigHand;
sigaction(SIGHUP, &sa, NULL);	sigaction(SIGHUP, &sa, NULL);
	sigaction(SIGINT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL);	sigaction(SIGTERM, &sa, NULL);
sigaction(SIGCHLD, &sa, NULL);	sigaction(SIGCHLD, &sa, NULL);
sigaction(SIGPIPE, &sa, NULL);	sigaction(SIGPIPE, &sa, NULL);
Line 195 end: /* free all resources */	Line 194 end: /* free all resources */
call.CloseLOG(logg);	call.CloseLOG(logg);
call.ClosePUB(pub);	call.ClosePUB(pub);
call.CloseACC(acc);	call.CloseACC(acc);
for (i = 0; i < 3; i++)	mqttUnloadRTLM(acc);
mqttUnloadRTLM(i);	mqttUnloadRTLM(pub);
closelog();	mqttUnloadRTLM(logg);
cfgUnloadConfig(&cfg);	cfgUnloadConfig(&cfg);
pthread_mutex_destroy(&mtx_pub);	closelog();
pthread_mutex_destroy(&mtx_sess);
return ret;	return ret;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.2.2.3
changed lines
	Added in v.1.2.2.10