diff --git a/daemon/main.c b/daemon/main.c index f4ef249b3..3e5b84c35 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -1023,7 +1023,7 @@ static void early_init(void) { } static void init_everything(void) { - log_init("rtpengine"); + log_init(rtpe_common_config_ptr->log_name); log_format(rtpe_config.log_format); recording_fs_init(rtpe_config.spooldir, rtpe_config.rec_method, rtpe_config.rec_format); rtpe_ssl_init(); diff --git a/daemon/rtpengine.pod b/daemon/rtpengine.pod index 39674277e..c30d53468 100644 --- a/daemon/rtpengine.pod +++ b/daemon/rtpengine.pod @@ -318,6 +318,11 @@ if logging to syslog. Don't add timestamps to log lines written to stderr. Only useful in combination with B<--log-stderr>. +=item B<--log-name=>I + +Set the id to be printed in syslog. +Defaults to B. + =item B<--log-mark-prefix=>I Prefix to be added to particular data fields in log files that are deemed diff --git a/lib/auxlib.c b/lib/auxlib.c index 24902504d..880f444ab 100644 --- a/lib/auxlib.c +++ b/lib/auxlib.c @@ -96,6 +96,7 @@ void config_load_free(struct rtpengine_common_config *cconfig) { g_free(cconfig->config_file); g_free(cconfig->config_section); g_free(cconfig->log_facility); + g_free(cconfig->log_name); g_free(cconfig->log_mark_prefix); g_free(cconfig->log_mark_suffix); g_free(cconfig->pidfile); @@ -155,6 +156,7 @@ void config_load(int *argc, char ***argv, GOptionEntry *app_entries, const char { "split-logs", 0, 0, G_OPTION_ARG_NONE, &rtpe_common_config_ptr->split_logs, "Split multi-line log messages", NULL }, { "max-log-line-length",0, 0, G_OPTION_ARG_INT, &rtpe_common_config_ptr->max_log_line_length, "Break log lines at this length","INT" }, { "no-log-timestamps", 0, 0, G_OPTION_ARG_NONE, &rtpe_common_config_ptr->no_log_timestamps,"Drop timestamps from log lines to stderr",NULL }, + { "log-name", 0, 0, G_OPTION_ARG_STRING, &rtpe_common_config_ptr->log_name, "Set the id to be printed in syslog", NULL }, { "log-mark-prefix", 0, 0, G_OPTION_ARG_STRING, &rtpe_common_config_ptr->log_mark_prefix,"Prefix for sensitive log info", NULL }, { "log-mark-suffix", 0, 0, G_OPTION_ARG_STRING, &rtpe_common_config_ptr->log_mark_suffix,"Suffix for sensitive log info", NULL }, { "pidfile", 'p', 0, G_OPTION_ARG_FILENAME, &rtpe_common_config_ptr->pidfile, "Write PID to file", "FILE" }, @@ -300,6 +302,9 @@ void config_load(int *argc, char ***argv, GOptionEntry *app_entries, const char out: // default common values, if not configured + if (rtpe_common_config_ptr->log_name == NULL) + rtpe_common_config_ptr->log_name = g_strdup("rtpengine"); + if (rtpe_common_config_ptr->log_mark_prefix == NULL) rtpe_common_config_ptr->log_mark_prefix = g_strdup(""); diff --git a/lib/auxlib.h b/lib/auxlib.h index 9fe8861d4..65f397cb9 100644 --- a/lib/auxlib.h +++ b/lib/auxlib.h @@ -23,6 +23,7 @@ struct rtpengine_common_config { int log_stderr; int split_logs; int no_log_timestamps; + char *log_name; char *log_mark_prefix; char *log_mark_suffix; char *pidfile;