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

Added argument '-m' to skygw_logmanager_init which takes the identity string for syslog as additional argument. If syslog is enabled in configuration, but identity is not specified, host process name is used. 'maxscale', for example.

Browse Source
This commit is contained in:
vraatikka
2013-11-11 11:02:05 +02:00
parent b996631fc9
commit 517b6a5ee3
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
log_manager/log_manager.cc
View File

@ -57,8 +57,9 @@
const char* shm_pathname = "/dev/shm"; const char* shm_pathname = "/dev/shm";
/** Logfile ids from call argument '-s' */ /** Logfile ids from call argument '-s' */
char* shmem_id_str = NULL; char* shmem_id_str = NULL;
char* syslog_id_str = NULL; char* syslog_id_str = NULL;
char* syslog_ident_str = NULL;
/** /**
* Global log manager pointer and lock variable. * Global log manager pointer and lock variable.
* lmlock protects logmanager access. * lmlock protects logmanager access.
@ -1350,6 +1351,7 @@ static bool fnames_conf_init(
"-i <error suffix> ............(\".log\")\n" "-i <error suffix> ............(\".log\")\n"
"-j <log path> ............(\"/tmp\")\n" "-j <log path> ............(\"/tmp\")\n"
"-l <syslog log file ids> .......(no default)\n" "-l <syslog log file ids> .......(no default)\n"
"-m <syslog ident> ............(argv[0])\n"
"-s <shmem log file ids> .......(no default)\n"; "-s <shmem log file ids> .......(no default)\n";
/** /**
@ -1360,7 +1362,8 @@ static bool fnames_conf_init(
fn->fn_chk_top = CHK_NUM_FNAMES; fn->fn_chk_top = CHK_NUM_FNAMES;
fn->fn_chk_tail = CHK_NUM_FNAMES; fn->fn_chk_tail = CHK_NUM_FNAMES;
#endif #endif
while ((opt = getopt(argc, argv, "+a:b:c:d:e:f:g:h:i:j:l:s:")) != -1) { while ((opt = getopt(argc, argv, "+a:b:c:d:e:f:g:h:i:j:l:m:s:")) != -1)
{
switch (opt) { switch (opt) {
case 'a': case 'a':
fn->fn_debug_prefix = strndup(optarg, MAX_PREFIXLEN); fn->fn_debug_prefix = strndup(optarg, MAX_PREFIXLEN);
@ -1402,6 +1405,14 @@ static bool fnames_conf_init(
syslog_id_str = optarg; syslog_id_str = optarg;
break; break;
case 'm':
/**
* Identity string for syslog printing, needs '-l'
* to be effective.
*/
syslog_ident_str = optarg;
break;
case 's': case 's':
/** record list of log file ids for later use */ /** record list of log file ids for later use */
shmem_id_str = optarg; shmem_id_str = optarg;
@ -1434,6 +1445,10 @@ static bool fnames_conf_init(
fn->fn_logpath = (fn->fn_logpath == NULL) ? fn->fn_logpath = (fn->fn_logpath == NULL) ?
strdup(get_logpath_default()) : fn->fn_logpath; strdup(get_logpath_default()) : fn->fn_logpath;
/** Set identity string for syslog if it is not set in config.*/
syslog_ident_str = (syslog_ident_str == NULL) ?
syslog_ident_str = strdup(*argv) : syslog_ident_str;
/* ss_dfprintf(stderr, "\n\n\tCommand line : "); /* ss_dfprintf(stderr, "\n\n\tCommand line : ");
for (i=0; i<argc; i++) { for (i=0; i<argc; i++) {
ss_dfprintf(stderr, "%s ", argv[i]); ss_dfprintf(stderr, "%s ", argv[i]);
@ -1550,15 +1565,16 @@ static char* fname_conf_get_suffix(
static bool logfiles_init( static bool logfiles_init(
logmanager_t* lm) logmanager_t* lm)
{ {
bool succp = true; bool succp = true;
int lid = LOGFILE_FIRST; int lid = LOGFILE_FIRST;
int i = 0; int i = 0;
bool store_shmem; bool store_shmem;
bool write_syslog; bool write_syslog;
char* syslog_ident;
if (syslog_id_str != NULL) if (syslog_id_str != NULL)
{ {
openlog("maxscale", LOG_PID | LOG_NDELAY, LOG_USER); openlog(syslog_ident_str, LOG_PID | LOG_NDELAY, LOG_USER);
} }
/** /**
* Initialize log files, pass softlink flag if necessary. * Initialize log files, pass softlink flag if necessary.