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

Log: No more argv parsing for log manager.

Browse Source 
Earlier, the global setting for the syslog decided whether syslog
was enabled when skygw_logmanager_init was called, but not whether
logging to syslog actually was made.

Now syslog logging is enabled by default and the global setting
decides whether or not syslog logging actually is made. That is,
this opens up the possiblity for making it possible to turn on
and off sysloging at runtime.

Further, although the API led you to believe otherwise, it was
hardwired that LOGFILE_ERROR and LOGFILE_MESSAGE messages were
written to syslog.

The changed removed the need for passing an argv array explicitly.
This commit is contained in:
Johan Wikman
2015-11-10 14:37:49 +02:00
parent 0b7de96eff
commit acb0a523a7
11 changed files with 56 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/gateway.c
View File

@ -1089,7 +1089,7 @@ int main(int argc, char **argv)
write_footer,
NULL};
*syslog_enabled = 0;
*syslog_enabled = 1;
*maxscalelog_enabled = 1;
sigemptyset(&sigpipe_mask);
@ -1698,9 +1698,6 @@ int main(int argc, char **argv)
/**
* Init Log Manager for MaxScale.
* The skygw_logmanager_init expects to take arguments as passed to main
* and proesses them with getopt, therefore we need to give it a dummy
* argv[0]
*/
{
bool succp;
@ -1713,8 +1710,6 @@ int main(int argc, char **argv)
goto return_main;
}
argv[0] = "MaxScale";
if (!(*syslog_enabled))
{
printf("Syslog logging is disabled.\n");
@ -1727,10 +1722,7 @@ int main(int argc, char **argv)
logmanager_enable_syslog(*syslog_enabled);
logmanager_enable_maxscalelog(*maxscalelog_enabled);
char* log_argv[] = { "MaxScale", "-l", "LOGFILE_MESSAGE,LOGFILE_ERROR", NULL };
int log_argc = sizeof(log_argv) / sizeof(log_argv[0]) - 1;
succp = skygw_logmanager_init(NULL, get_logdir(), log_target, log_argc, log_argv);
succp = skygw_logmanager_init(NULL, get_logdir(), log_target);
if (!succp)
{