get rid of more globals
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6513 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
1bbda8eb61
commit
c320b9621d
|
@ -68,8 +68,6 @@ static logfile_profile_t *default_profile;
|
||||||
|
|
||||||
static switch_status_t load_config(logfile_profile_t *profile, switch_xml_t xml);
|
static switch_status_t load_config(logfile_profile_t *profile, switch_xml_t xml);
|
||||||
|
|
||||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_logfile, default_profile->logfile);
|
|
||||||
|
|
||||||
void process_levels(logfile_profile_t *profile, char *p)
|
void process_levels(logfile_profile_t *profile, char *p)
|
||||||
{
|
{
|
||||||
int x, i, argc = 0;
|
int x, i, argc = 0;
|
||||||
|
@ -255,8 +253,7 @@ static switch_status_t load_config(logfile_profile_t *profile, switch_xml_t xml)
|
||||||
char *var = (char *) switch_xml_attr_soft(param, "name");
|
char *var = (char *) switch_xml_attr_soft(param, "name");
|
||||||
char *val = (char *) switch_xml_attr_soft(param, "value");
|
char *val = (char *) switch_xml_attr_soft(param, "value");
|
||||||
if (!strcmp(var, "logfile")) {
|
if (!strcmp(var, "logfile")) {
|
||||||
set_global_logfile(val);
|
profile->logfile = strdup(val);
|
||||||
/* TODO: do this for multiple profiles */
|
|
||||||
} else if (!strcmp(var, "level")) {
|
} else if (!strcmp(var, "level")) {
|
||||||
process_levels(profile, val);
|
process_levels(profile, val);
|
||||||
} else if (!strcmp(var, "rollover")) {
|
} else if (!strcmp(var, "rollover")) {
|
||||||
|
@ -270,8 +267,7 @@ static switch_status_t load_config(logfile_profile_t *profile, switch_xml_t xml)
|
||||||
if (switch_strlen_zero(profile->logfile)) {
|
if (switch_strlen_zero(profile->logfile)) {
|
||||||
char logfile[512];
|
char logfile[512];
|
||||||
snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch.log");
|
snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch.log");
|
||||||
/* TODO: Make this not global */
|
profile->logfile = strdup(logfile);
|
||||||
set_global_logfile(logfile);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue