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

Removed LOGIF macros which prevented implicit initialization of the log manager.

Browse Source
This commit is contained in:
Markus Makela
2015-09-06 06:51:33 +03:00
parent 160bbb70ee
commit 0febf23992
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
server/core/gateway.c
View File

@ -323,9 +323,9 @@ static void sigusr1_handler (int i)
static void sigterm_handler (int i) { static void sigterm_handler (int i) {
extern void shutdown_server(); extern void shutdown_server();
LOGIF(LE, (skygw_log_write_flush( skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"MaxScale received signal SIGTERM. Exiting."))); "MaxScale received signal SIGTERM. Exiting.");
skygw_log_sync_all(); skygw_log_sync_all();
shutdown_server(); shutdown_server();
} }
@ -335,9 +335,9 @@ sigint_handler (int i)
{ {
extern void shutdown_server(); extern void shutdown_server();
LOGIF(LE, (skygw_log_write_flush( skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"MaxScale received signal SIGINT. Shutting down."))); "MaxScale received signal SIGINT. Shutting down.");
skygw_log_sync_all(); skygw_log_sync_all();
shutdown_server(); shutdown_server();
fprintf(stderr, "\n\nShutting down MaxScale\n\n"); fprintf(stderr, "\n\nShutting down MaxScale\n\n");
@ -393,9 +393,9 @@ sigfatal_handler (int i)
GATEWAY_CONF* cnf = config_get_global_options(); GATEWAY_CONF* cnf = config_get_global_options();
fprintf(stderr, "\n\nMaxScale "MAXSCALE_VERSION" received fatal signal %d\n", i); fprintf(stderr, "\n\nMaxScale "MAXSCALE_VERSION" received fatal signal %d\n", i);
LOGIF(LE, (skygw_log_write_flush( skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Fatal: MaxScale "MAXSCALE_VERSION" received fatal signal %d. Attempting backtrace.", i))); "Fatal: MaxScale "MAXSCALE_VERSION" received fatal signal %d. Attempting backtrace.", i);
skygw_log_write_flush(LE,"Commit ID: %s System name: %s " skygw_log_write_flush(LE,"Commit ID: %s System name: %s "
"Release string: %s Embedded library version: %s", "Release string: %s Embedded library version: %s",
@ -408,9 +408,9 @@ sigfatal_handler (int i)
if (symbols) { if (symbols) {
for( n = 0; n < count; n++ ) { for( n = 0; n < count; n++ ) {
LOGIF(LE, (skygw_log_write_flush( skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
" %s\n", symbols[n]))); " %s\n", symbols[n]);
} }
free(symbols); free(symbols);
} else { } else {
@ -456,12 +456,12 @@ static int signal_set (int sig, void (*handler)(int)) {
int eno = errno; int eno = errno;
errno = 0; errno = 0;
char errbuf[STRERROR_BUFLEN]; char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write_flush( skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : Failed call sigaction() in %s due to %d, %s.", "Error : Failed call sigaction() in %s due to %d, %s.",
program_invocation_short_name, program_invocation_short_name,
eno, eno,
strerror_r(eno, errbuf, sizeof(errbuf))))); strerror_r(eno, errbuf, sizeof(errbuf)));
rc = 1; rc = 1;
} }
return rc; return rc;
@ -485,13 +485,13 @@ int ntfw_cb(
int eno = errno; int eno = errno;
errno = 0; errno = 0;
char errbuf[STRERROR_BUFLEN]; char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write( skygw_log_write(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : Failed to remove the data directory %s of " "Error : Failed to remove the data directory %s of "
"MaxScale due to %d, %s.", "MaxScale due to %d, %s.",
datadir, datadir,
eno, eno,
strerror_r(eno, errbuf, sizeof(errbuf))))); strerror_r(eno, errbuf, sizeof(errbuf)));
} }
return rc; return rc;
} }
@ -786,13 +786,13 @@ static void print_log_n_stderr(
if (do_log) { if (do_log) {
char errbuf[STRERROR_BUFLEN]; char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write_flush( skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"%s %s %s %s", "%s %s %s %s",
log_err, log_err,
logstr, logstr,
eno == 0 ? " " : "Error :", eno == 0 ? " " : "Error :",
eno == 0 ? " " : strerror_r(eno, errbuf, sizeof(errbuf))))); eno == 0 ? " " : strerror_r(eno, errbuf, sizeof(errbuf)));
} }
if (do_stderr) { if (do_stderr) {
char errbuf[STRERROR_BUFLEN]; char errbuf[STRERROR_BUFLEN];
@ -825,14 +825,14 @@ static bool file_is_readable(
absolute_pathname, absolute_pathname,
strerror_r(eno, errbuf, sizeof(errbuf))); strerror_r(eno, errbuf, sizeof(errbuf)));
} }
LOGIF(LE, (skygw_log_write_flush( skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Warning : Failed to read the configuration file %s due " "Warning : Failed to read the configuration file %s due "
"to %d, %s.", "to %d, %s.",
absolute_pathname, absolute_pathname,
eno, eno,
strerror_r(eno, errbuf, sizeof(errbuf))))); strerror_r(eno, errbuf, sizeof(errbuf)));
LOGIF(LE,(skygw_log_sync_all())); skygw_log_sync_all();
succp = false; succp = false;
} }
return succp; return succp;
@ -858,13 +858,13 @@ static bool file_is_writable(
eno, eno,
strerror_r(eno, errbuf, sizeof(errbuf))); strerror_r(eno, errbuf, sizeof(errbuf)));
} }
LOGIF(LE, (skygw_log_write_flush( skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : unable to open file %s for write due " "Error : unable to open file %s for write due "
"to %d, %s.", "to %d, %s.",
absolute_pathname, absolute_pathname,
eno, eno,
strerror_r(eno, errbuf, sizeof(errbuf))))); strerror_r(eno, errbuf, sizeof(errbuf)));
succp = false; succp = false;
} }
return succp; return succp;
@ -919,14 +919,14 @@ static char* get_expanded_pathname(
relative_path, relative_path,
strerror_r(eno, errbuf, sizeof(errbuf))); strerror_r(eno, errbuf, sizeof(errbuf)));
LOGIF(LE, (skygw_log_write_flush( skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Warning : Failed to read the " "Warning : Failed to read the "
"directory %s, due " "directory %s, due "
"to %d, %s.", "to %d, %s.",
relative_path, relative_path,
eno, eno,
strerror_r(eno, errbuf, sizeof(errbuf))))); strerror_r(eno, errbuf, sizeof(errbuf)));
free(expanded_path); free(expanded_path);
*output_path = NULL; *output_path = NULL;
goto return_cnf_file_buf; goto return_cnf_file_buf;
@ -949,10 +949,10 @@ static char* get_expanded_pathname(
ss_dassert(cnf_file_buf != NULL); ss_dassert(cnf_file_buf != NULL);
char errbuf[STRERROR_BUFLEN]; char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write_flush( skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : Memory allocation failed due to %s.", "Error : Memory allocation failed due to %s.",
strerror_r(errno, errbuf, sizeof(errbuf))))); strerror_r(errno, errbuf, sizeof(errbuf)));
free(expanded_path); free(expanded_path);
expanded_path = NULL; expanded_path = NULL;
@ -1828,7 +1828,7 @@ int main(int argc, char **argv)
} }
} }
} }
LOGIF(LE, (skygw_log_write_flush( skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : mysql_library_init failed. It is a " "Error : mysql_library_init failed. It is a "
"mandatory component, required by router services and " "mandatory component, required by router services and "
@ -1836,7 +1836,7 @@ int main(int argc, char **argv)
mysql_errno(NULL), mysql_errno(NULL),
mysql_error(NULL), mysql_error(NULL),
__FILE__, __FILE__,
__LINE__))); __LINE__);
rc = MAXSCALE_NOLIBRARY; rc = MAXSCALE_NOLIBRARY;
goto return_main; goto return_main;
} }
@ -1847,11 +1847,11 @@ int main(int argc, char **argv)
char* fprerr = "Failed to load MaxScale configuration " char* fprerr = "Failed to load MaxScale configuration "
"file. Exiting. See the error log for details."; "file. Exiting. See the error log for details.";
print_log_n_stderr(false, !daemon_mode, fprerr, fprerr, 0); print_log_n_stderr(false, !daemon_mode, fprerr, fprerr, 0);
LOGIF(LE, (skygw_log_write_flush( skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : Failed to load MaxScale configuration file %s. " "Error : Failed to load MaxScale configuration file %s. "
"Exiting.", "Exiting.",
cnf_file_path))); cnf_file_path);
rc = MAXSCALE_BADCONFIG; rc = MAXSCALE_BADCONFIG;
goto return_main; goto return_main;
} }