hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition for shutdown mechanism for the gateway

Browse Source 
Addition of stop and restart service

Fix for telnetd in Makefile

Fix for printing the server names in services
This commit is contained in:
Mark Riddoch
2013-06-25 14:00:18 +02:00
parent 72223fd4cf
commit 34fdbdb34d
11 changed files with 167 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/gateway.c
View File

@ -50,9 +50,10 @@ static void sighup_handler (int i) {
}
static void sigterm_handler (int i) {
extern void shutdown_gateway();
fprintf(stderr, "Signal SIGTERM %i received ...Exiting!\n", i);
exit(0);
shutdown_gateway();
}
/* wrapper for sigaction */
@ -170,7 +171,8 @@ main(int argc, char **argv)
{
int daemon_mode = 1;
sigset_t sigset;
int n;
int n, n_threads;
void **threads;
char buf[1024], *home, *cnf_file = NULL;
if ((home = getenv("GATEWAY_HOME")) != NULL)
@ -250,8 +252,24 @@ char buf[1024], *home, *cnf_file = NULL;
* Start the polling threads, note this is one less than is configured as the
* main thread will also poll.
*/
for (n = 0; n < config_threadcount() - 1; n++)
thread_start(poll_waitevents);
n_threads = config_threadcount();
threads = (void **)calloc(n_threads, sizeof(void *));
for (n = 0; n < n_threads - 1; n++)
threads[n] = thread_start(poll_waitevents);
poll_waitevents();
for (n = 0; n < n_threads - 1; n++)
thread_wait(threads[n]);
printf("Gateway shutdown\n");
return 0;
} // End of main
/**
* Shutdown the gateway
*/
void
shutdown_gateway()
{
poll_shutdown();
}