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

Removed logging from SIGTERM and SIGINT handlers

Browse Source 
The logging of messages in a signal handler is not safe and sometimes caused
MaxScale to hang.
This commit is contained in:
Markus Makela
2016-03-01 13:34:15 +02:00
parent e1a8a6f373
commit 8cf1479f79
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
server/core/gateway.c
View File

@ -151,6 +151,7 @@ static struct option long_options[] = {
static bool syslog_configured = false; static bool syslog_configured = false;
static bool maxlog_configured = false; static bool maxlog_configured = false;
static bool log_to_shm_configured = false; static bool log_to_shm_configured = false;
static int last_signal = 0;
static int cnf_preparser(void* data, const char* section, const char* name, const char* value); static int cnf_preparser(void* data, const char* section, const char* name, const char* value);
static void log_flush_shutdown(void); static void log_flush_shutdown(void);
@ -188,6 +189,9 @@ static int set_user(const char* user);
bool pid_file_exists(); bool pid_file_exists();
void write_child_exit_code(int fd, int code); void write_child_exit_code(int fd, int code);
static bool change_cwd(); static bool change_cwd();
void shutdown_server();
static void log_exit_status();
/** SSL multi-threading functions and structures */ /** SSL multi-threading functions and structures */
static SPINLOCK* ssl_locks; static SPINLOCK* ssl_locks;
@ -289,21 +293,17 @@ static void sigusr1_handler (int i)
mxs_log_rotate(); mxs_log_rotate();
} }
static void sigterm_handler (int i) { static void sigterm_handler(int i)
extern void shutdown_server(); {
last_signal = i;
MXS_ERROR("MaxScale received signal SIGTERM. Exiting.");
mxs_log_flush_sync();
shutdown_server(); shutdown_server();
fprintf(stderr, "\n\nShutting down MaxScale\n\n");
} }
static void static void
sigint_handler (int i) sigint_handler(int i)
{ {
extern void shutdown_server(); last_signal = i;
MXS_ERROR("MaxScale received signal SIGINT. Shutting down.");
mxs_log_flush_sync();
shutdown_server(); shutdown_server();
fprintf(stderr, "\n\nShutting down MaxScale\n\n"); fprintf(stderr, "\n\nShutting down MaxScale\n\n");
} }
@ -1987,6 +1987,7 @@ int main(int argc, char **argv)
/*< Stop all the monitors */ /*< Stop all the monitors */
monitorStopAll(); monitorStopAll();
log_exit_status();
MXS_NOTICE("MaxScale is shutting down."); MXS_NOTICE("MaxScale is shutting down.");
/** Release mysql thread context*/ /** Release mysql thread context*/
mysql_thread_end(); mysql_thread_end();
@ -2594,3 +2595,23 @@ static bool change_cwd()
return rval; return rval;
} }
/**
* @brief Log a message about the last received signal
*/
static void log_exit_status()
{
switch (last_signal)
{
case SIGTERM:
MXS_NOTICE("MaxScale received signal SIGTERM. Exiting.");
break;
case SIGINT:
MXS_NOTICE("MaxScale received signal SIGINT. Exiting.");
break;
default:
break;
}
}