- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6521 - in freeswitch/trunk/conf: dialplan directory
by Freeswitch SVN 05 Dec '07

05 Dec '07

Author: brian Date: Wed Dec 5 13:08:27 2007 New Revision: 6521 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/directory/default.xml Log: some new things Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Dec 5 13:08:27 2007 @@ -32,7 +32,7 @@ <anti-action application="set" data="call_timeout=30000"/> <anti-action application="set" data="hangup_after_bridge=true"/> <anti-action application="set" data="continue_on_fail=true"/> - <anti-action application="bridge" data="sofia/$${domain}/${dialed_ext}"/> + <anti-action application="bridge" data="USER/${dialed_ext}@$${domain}"/> <anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/> </condition> </extension> Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Wed Dec 5 13:08:27 2007 @@ -90,6 +90,7 @@ <param name="vm-password" value="1234"/>   + <param name="dial-string" value="sofia/${use_profile/888(a)conference.freeswitch.org"/> </params> </user>

1 0

[commit] r6520 - freeswitch/trunk/src
by Freeswitch SVN 05 Dec '07

05 Dec '07

Author: anthm Date: Wed Dec 5 12:16:50 2007 New Revision: 6520 Modified: freeswitch/trunk/src/switch_rtp.c Log: tweak Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Dec 5 12:16:50 2007 @@ -463,13 +463,13 @@ rtp_session->pool = pool; rtp_session->te = 101; - switch_mutex_init(&rtp_session->flag_mutex, SWITCH_MUTEX_NESTED, rtp_session->pool); - switch_mutex_init(&rtp_session->dtmf_data.dtmf_mutex, SWITCH_MUTEX_NESTED, rtp_session->pool); + switch_mutex_init(&rtp_session->flag_mutex, SWITCH_MUTEX_NESTED, pool); + switch_mutex_init(&rtp_session->dtmf_data.dtmf_mutex, SWITCH_MUTEX_NESTED, pool); switch_buffer_create_dynamic(&rtp_session->dtmf_data.dtmf_buffer, 128, 128, 0); switch_rtp_set_flag(rtp_session, flags); /* for from address on recvfrom calls */ - switch_sockaddr_info_get(&rtp_session->from_addr, NULL, SWITCH_UNSPEC, 0, 0, rtp_session->pool); + switch_sockaddr_info_get(&rtp_session->from_addr, NULL, SWITCH_UNSPEC, 0, 0, pool); memset(&policy, 0, sizeof(policy)); if (crypto_key) { @@ -535,7 +535,7 @@ rtp_session->payload = payload; rtp_session->ms_per_packet = ms_per_packet; rtp_session->samples_per_interval = rtp_session->conf_samples_per_interval = samples_per_interval; - rtp_session->timer_name = switch_core_strdup(rtp_session->pool, timer_name); + rtp_session->timer_name = switch_core_strdup(pool, timer_name); if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { err_status_t stat; @@ -561,7 +561,7 @@ } if (!switch_strlen_zero(timer_name)) { - if (switch_core_timer_init(&rtp_session->timer, timer_name, ms_per_packet / 1000, samples_per_interval, rtp_session->pool) == + if (switch_core_timer_init(&rtp_session->timer, timer_name, ms_per_packet / 1000, samples_per_interval, pool) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting timer [%s] %d bytes per %dms\n", timer_name, samples_per_interval, ms_per_packet);

1 0

[commit] r6519 - freeswitch/trunk/src/mod/loggers/mod_logfile
by Freeswitch SVN 05 Dec '07

05 Dec '07

Author: mikej Date: Wed Dec 5 09:42:25 2007 New Revision: 6519 Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Log: use function to avoid build error. Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Wed Dec 5 09:42:25 2007 @@ -290,6 +290,9 @@ profile->logfile = strdup(logfile); } + /* TODO: add mapping parsing from config */ + add_mapping("all", profile); + return 0; }

1 0

[commit] r6518 - freeswitch/trunk/src/mod/loggers/mod_logfile
by Freeswitch SVN 05 Dec '07

05 Dec '07

Author: mikej Date: Wed Dec 5 08:25:33 2007 New Revision: 6518 Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Log: always init the levels array. Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Wed Dec 5 08:25:33 2007 @@ -94,15 +94,6 @@ int x, i, argc = 0; char *argv[10] = { 0 }; - profile->levels[0].level = SWITCH_LOG_CONSOLE; - profile->levels[1].level = SWITCH_LOG_ALERT; - profile->levels[2].level = SWITCH_LOG_CRIT; - profile->levels[3].level = SWITCH_LOG_ERROR; - profile->levels[4].level = SWITCH_LOG_WARNING; - profile->levels[5].level = SWITCH_LOG_NOTICE; - profile->levels[6].level = SWITCH_LOG_INFO; - profile->levels[7].level = SWITCH_LOG_DEBUG; - for (i=0; i < (sizeof(profile->levels) / sizeof(struct level_set)); i++) { profile->levels[i].on = 0; } @@ -269,6 +260,15 @@ { switch_xml_t param; + profile->levels[0].level = SWITCH_LOG_CONSOLE; + profile->levels[1].level = SWITCH_LOG_ALERT; + profile->levels[2].level = SWITCH_LOG_CRIT; + profile->levels[3].level = SWITCH_LOG_ERROR; + profile->levels[4].level = SWITCH_LOG_WARNING; + profile->levels[5].level = SWITCH_LOG_NOTICE; + profile->levels[6].level = SWITCH_LOG_INFO; + profile->levels[7].level = SWITCH_LOG_DEBUG; + for (param = switch_xml_child(xml, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value");

1 0

[commit] r6517 - freeswitch/trunk/src/mod/loggers/mod_logfile
by Freeswitch SVN 05 Dec '07

05 Dec '07

Author: mikej Date: Wed Dec 5 08:15:21 2007 New Revision: 6517 Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Log: another step towards multi-profile file logger. Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Wed Dec 5 08:15:21 2007 @@ -297,16 +297,26 @@ static void event_handler(switch_event_t *event) { const char *sig = switch_event_get_header(event, "Trapped-Signal"); + switch_hash_index_t *hi; + void *val; + const void *var; + logfile_profile_t *profile; if (sig && !strcmp(sig, "HUP")) { if (globals.rotate) { - /* TODO: loop through all profiles */ - mod_logfile_rotate(default_profile); + for (hi = switch_hash_first(NULL, profile_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, &var, NULL, &val); + profile = val; + mod_logfile_rotate(profile); + } } else { switch_mutex_lock(globals.mutex); - /* TODO: loop through all profiles */ - switch_file_close(default_profile->log_afd); - mod_logfile_openlogfile(default_profile, SWITCH_TRUE); + for (hi = switch_hash_first(NULL, profile_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, &var, NULL, &val); + profile = val; + switch_file_close(profile->log_afd); + mod_logfile_openlogfile(profile, SWITCH_TRUE); + } switch_mutex_unlock(globals.mutex); } } @@ -362,11 +372,14 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Settings, check the new config!\n"); } else { logfile_profile_t *profile; - profile = switch_core_alloc(module_pool, sizeof(*default_profile)); + profile = switch_core_alloc(module_pool, sizeof(*profile)); memset(profile, 0, sizeof(*profile)); profile->name = switch_core_strdup(module_pool, switch_str_nil(name)); load_profile(profile, settings); switch_core_hash_insert(profile_hash, profile->name, (void *) profile); + if (mod_logfile_openlogfile(profile, SWITCH_TRUE) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_GENERR; + } /* TODO: remove default_profile */ default_profile = profile; } @@ -376,11 +389,6 @@ switch_xml_free(xml); } - /* TODO: do this for all profiles */ - if (mod_logfile_openlogfile(default_profile, SWITCH_TRUE) != SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_GENERR; - } - switch_log_bind_logger(mod_logfile_logger, SWITCH_LOG_DEBUG); return SWITCH_STATUS_SUCCESS;

1 0

[commit] r6516 - freeswitch/trunk/src/mod/loggers/mod_logfile
by Freeswitch SVN 05 Dec '07

05 Dec '07

Author: mikej Date: Wed Dec 5 08:04:49 2007 New Revision: 6516 Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Log: unused var. Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Wed Dec 5 08:04:49 2007 @@ -58,7 +58,6 @@ struct logfile_profile { char *name; - unsigned int log_fd; switch_size_t log_size; /* keep the log size in check for rotation */ switch_size_t roll_size; /* the size that we want to rotate the file at */ char *logfile;

1 0

[commit] r6515 - freeswitch/trunk/src/mod/loggers/mod_logfile
by Freeswitch SVN 05 Dec '07

05 Dec '07

Author: mikej Date: Wed Dec 5 07:52:37 2007 New Revision: 6515 Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Log: another step towards multi-profile file logger. Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Wed Dec 5 07:52:37 2007 @@ -42,6 +42,9 @@ static const uint8_t STATIC_LEVELS[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; static switch_memory_pool_t *module_pool = NULL; +static switch_hash_t *log_hash = NULL; +static switch_hash_t *name_hash = NULL; +static switch_hash_t *profile_hash = NULL; static struct { int rotate; @@ -54,6 +57,7 @@ }; struct logfile_profile { + char *name; unsigned int log_fd; switch_size_t log_size; /* keep the log size in check for rotation */ switch_size_t roll_size; /* the size that we want to rotate the file at */ @@ -66,7 +70,25 @@ 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_profile(logfile_profile_t *profile, switch_xml_t xml); + +static void del_mapping(char *var) +{ + switch_core_hash_insert(log_hash, var, NULL); +} + +static void add_mapping(char *var, logfile_profile_t *profile) +{ + char *name; + + if (!(name = switch_core_hash_find(name_hash, var))) { + name = switch_core_strdup(module_pool, var); + switch_core_hash_insert(name_hash, name, name); + } + + del_mapping(name); + switch_core_hash_insert(log_hash, name, (void *) profile); +} void process_levels(logfile_profile_t *profile, char *p) { @@ -244,7 +266,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t load_config(logfile_profile_t *profile, switch_xml_t xml) +static switch_status_t load_profile(logfile_profile_t *profile, switch_xml_t xml) { switch_xml_t param; @@ -301,6 +323,19 @@ memset(&globals, 0, sizeof(globals)); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); + if (log_hash) { + switch_core_hash_destroy(&log_hash); + } + if (name_hash) { + switch_core_hash_destroy(&name_hash); + } + if (profile_hash) { + switch_core_hash_destroy(&profile_hash); + } + switch_core_hash_init(&log_hash, module_pool); + switch_core_hash_init(&name_hash, module_pool); + switch_core_hash_init(&profile_hash, module_pool); + if (switch_event_bind((char *) modname, SWITCH_EVENT_TRAP, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; @@ -323,13 +358,18 @@ } if ((profiles = switch_xml_child(cfg, "profiles"))) { for (xprofile = switch_xml_child(profiles, "profile"); xprofile; xprofile = xprofile->next) { + char *name = (char *) switch_xml_attr_soft(xprofile, "name"); if (!(settings = switch_xml_child(xprofile, "settings"))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Settings, check the new config!\n"); } else { - /* TODO: handle alloc of profile for multiple profiles*/ - default_profile = switch_core_alloc(module_pool, sizeof(*default_profile)); - memset(default_profile, 0, sizeof(*default_profile)); - load_config(default_profile, settings); + logfile_profile_t *profile; + profile = switch_core_alloc(module_pool, sizeof(*default_profile)); + memset(profile, 0, sizeof(*profile)); + profile->name = switch_core_strdup(module_pool, switch_str_nil(name)); + load_profile(profile, settings); + switch_core_hash_insert(profile_hash, profile->name, (void *) profile); + /* TODO: remove default_profile */ + default_profile = profile; } } }

1 0

[commit] r6514 - freeswitch/trunk/src/mod/loggers/mod_logfile
by Freeswitch SVN 05 Dec '07

05 Dec '07

Author: mikej Date: Tue Dec 4 22:17:34 2007 New Revision: 6514 Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Log: reformat Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Tue Dec 4 22:17:34 2007 @@ -44,8 +44,8 @@ static switch_memory_pool_t *module_pool = NULL; static struct { - int rotate; - switch_mutex_t *mutex; + int rotate; + switch_mutex_t *mutex; } globals; struct level_set { @@ -72,7 +72,7 @@ { int x, i, argc = 0; char *argv[10] = { 0 }; - + profile->levels[0].level = SWITCH_LOG_CONSOLE; profile->levels[1].level = SWITCH_LOG_ALERT; profile->levels[2].level = SWITCH_LOG_CRIT; @@ -86,7 +86,7 @@ profile->levels[i].on = 0; } - if ((argc = switch_separate_string(p, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) { + if ((argc = switch_separate_string(p, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) { for (x = 0; x < argc; x++) { if (!strncasecmp(argv[x], "alert", strlen(argv[x]))) { profile->levels[SWITCH_LOG_ALERT].on = 1; @@ -150,16 +150,16 @@ char *p = NULL; switch_status_t stat = 0; int64_t offset = 0; - switch_memory_pool_t *pool; - switch_time_exp_t tm; - char date[80] = ""; - switch_size_t retsize; - switch_status_t status = SWITCH_STATUS_SUCCESS; - - switch_mutex_lock(globals.mutex); + switch_memory_pool_t *pool; + switch_time_exp_t tm; + char date[80] = ""; + switch_size_t retsize; + switch_status_t status = SWITCH_STATUS_SUCCESS; + + switch_mutex_lock(globals.mutex); - switch_time_exp_lt(&tm, switch_time_now()); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d-%H-%M-%S", &tm); + switch_time_exp_lt(&tm, switch_time_now()); + switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d-%H-%M-%S", &tm); profile->log_size = 0; @@ -167,38 +167,38 @@ if (stat != SWITCH_STATUS_SUCCESS) { status = SWITCH_STATUS_FALSE; - goto end; - } + goto end; + } + - p = malloc(strlen(profile->logfile)+WARM_FUZZY_OFFSET); - assert(p); + assert(p); memset(p, '\0', strlen(profile->logfile)+WARM_FUZZY_OFFSET); - switch_core_new_memory_pool(&pool); + switch_core_new_memory_pool(&pool); for (i=1; i < MAX_ROT; i++) { sprintf((char *)p, "%s.%s.%i", profile->logfile, date, i); - if (switch_file_exists(p, pool) == SWITCH_STATUS_SUCCESS) { - continue; - } - - switch_file_close(profile->log_afd); - switch_file_rename(profile->logfile, p, pool); - mod_logfile_openlogfile(profile, SWITCH_FALSE); - break; + if (switch_file_exists(p, pool) == SWITCH_STATUS_SUCCESS) { + continue; + } + + switch_file_close(profile->log_afd); + switch_file_rename(profile->logfile, p, pool); + mod_logfile_openlogfile(profile, SWITCH_FALSE); + break; } free(p); - switch_core_destroy_memory_pool(&pool); + switch_core_destroy_memory_pool(&pool); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New log started.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New log started.\n"); - end: +end: - switch_mutex_unlock(globals.mutex); + switch_mutex_unlock(globals.mutex); return status; } @@ -211,19 +211,19 @@ if (len <= 0) { return SWITCH_STATUS_FALSE; - } - - switch_mutex_lock(globals.mutex); + } + + switch_mutex_lock(globals.mutex); /* TODO: handle null log_afd */ if (switch_file_write(profile->log_afd, log_data, &len) != SWITCH_STATUS_SUCCESS) { - switch_file_close(profile->log_afd); - mod_logfile_openlogfile(profile, SWITCH_TRUE); - len = strlen(log_data); - switch_file_write(profile->log_afd, log_data, &len); - } - - switch_mutex_unlock(globals.mutex); + switch_file_close(profile->log_afd); + mod_logfile_openlogfile(profile, SWITCH_TRUE); + len = strlen(log_data); + switch_file_write(profile->log_afd, log_data, &len); + } + + switch_mutex_unlock(globals.mutex); profile->log_size += len; @@ -236,11 +236,10 @@ static switch_status_t mod_logfile_logger(const switch_log_node_t *node, switch_log_level_t level) { - /* TODO: Handle multiple profiles */ if (default_profile->levels[node->level].on) { - mod_logfile_raw_write(default_profile, node->data); - } + mod_logfile_raw_write(default_profile, node->data); + } return SWITCH_STATUS_SUCCESS; } @@ -258,12 +257,12 @@ process_levels(profile, val); } else if (!strcmp(var, "rollover")) { profile->roll_size = atoi(val); - if (profile->roll_size < 0) { - profile->roll_size = 0; - } + if (profile->roll_size < 0) { + profile->roll_size = 0; + } } } - + if (switch_strlen_zero(profile->logfile)) { char logfile[512]; snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch.log"); @@ -276,20 +275,20 @@ static void event_handler(switch_event_t *event) { - const char *sig = switch_event_get_header(event, "Trapped-Signal"); + const char *sig = switch_event_get_header(event, "Trapped-Signal"); - if (sig && !strcmp(sig, "HUP")) { - if (globals.rotate) { + if (sig && !strcmp(sig, "HUP")) { + if (globals.rotate) { /* TODO: loop through all profiles */ - mod_logfile_rotate(default_profile); - } else { - switch_mutex_lock(globals.mutex); + mod_logfile_rotate(default_profile); + } else { + switch_mutex_lock(globals.mutex); /* TODO: loop through all profiles */ - switch_file_close(default_profile->log_afd); - mod_logfile_openlogfile(default_profile, SWITCH_TRUE); - switch_mutex_unlock(globals.mutex); - } - } + switch_file_close(default_profile->log_afd); + mod_logfile_openlogfile(default_profile, SWITCH_TRUE); + switch_mutex_unlock(globals.mutex); + } + } } SWITCH_MODULE_LOAD_FUNCTION(mod_logfile_load) @@ -298,9 +297,9 @@ switch_xml_t cfg, xml, settings, param, profiles, xprofile; module_pool = pool; - + memset(&globals, 0, sizeof(globals)); - switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); + switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); if (switch_event_bind((char *) modname, SWITCH_EVENT_TRAP, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); @@ -318,7 +317,7 @@ char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); if (!strcmp(var, "rotate")) { - globals.rotate = switch_true(val); + globals.rotate = switch_true(val); } } }

1 0

[commit] r6513 - freeswitch/trunk/src/mod/loggers/mod_logfile
by Freeswitch SVN 05 Dec '07

05 Dec '07

Author: mikej Date: Tue Dec 4 22:05:29 2007 New Revision: 6513 Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Log: get rid of more globals Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Tue Dec 4 22:05:29 2007 @@ -68,8 +68,6 @@ 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) { int x, i, argc = 0; @@ -255,8 +253,7 @@ char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); if (!strcmp(var, "logfile")) { - set_global_logfile(val); - /* TODO: do this for multiple profiles */ + profile->logfile = strdup(val); } else if (!strcmp(var, "level")) { process_levels(profile, val); } else if (!strcmp(var, "rollover")) { @@ -270,8 +267,7 @@ if (switch_strlen_zero(profile->logfile)) { char logfile[512]; snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch.log"); - /* TODO: Make this not global */ - set_global_logfile(logfile); + profile->logfile = strdup(logfile); } return 0;

1 0

[commit] r6512 - freeswitch/trunk/src/mod/loggers/mod_logfile
by Freeswitch SVN 05 Dec '07

05 Dec '07

Author: mikej Date: Tue Dec 4 22:00:14 2007 New Revision: 6512 Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Log: put levels in profile too Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Tue Dec 4 22:00:14 2007 @@ -48,12 +48,18 @@ switch_mutex_t *mutex; } globals; +struct level_set { + int level; + int on; +}; + struct logfile_profile { unsigned int log_fd; switch_size_t log_size; /* keep the log size in check for rotation */ switch_size_t roll_size; /* the size that we want to rotate the file at */ char *logfile; switch_file_t *log_afd; + struct level_set levels[8]; }; typedef struct logfile_profile logfile_profile_t; @@ -64,49 +70,45 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_logfile, default_profile->logfile); -/* i know this is strange but it's the fastest way i could think of managing log levels. */ -/* i'd rather not try to search something each time we get a message to log */ -struct level_set { - int level; - int on; -} static levels[] = { - {SWITCH_LOG_CONSOLE, 0}, /* 0 */ - {SWITCH_LOG_ALERT, 0}, /* 1 */ - {SWITCH_LOG_CRIT, 0}, /* 2 */ - {SWITCH_LOG_ERROR, 0}, /* 3 */ - {SWITCH_LOG_WARNING, 0}, /* 4 */ - {SWITCH_LOG_NOTICE, 0}, /* 5 */ - {SWITCH_LOG_INFO, 0}, /* 6 */ - {SWITCH_LOG_DEBUG, 0}, /* 7 */ -}; - -void process_levels(char *p) +void process_levels(logfile_profile_t *profile, char *p) { - int x, argc = 0; + int x, i, argc = 0; char *argv[10] = { 0 }; + + profile->levels[0].level = SWITCH_LOG_CONSOLE; + profile->levels[1].level = SWITCH_LOG_ALERT; + profile->levels[2].level = SWITCH_LOG_CRIT; + profile->levels[3].level = SWITCH_LOG_ERROR; + profile->levels[4].level = SWITCH_LOG_WARNING; + profile->levels[5].level = SWITCH_LOG_NOTICE; + profile->levels[6].level = SWITCH_LOG_INFO; + profile->levels[7].level = SWITCH_LOG_DEBUG; + + for (i=0; i < (sizeof(profile->levels) / sizeof(struct level_set)); i++) { + profile->levels[i].on = 0; + } - if ((argc = switch_separate_string(p, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) { + if ((argc = switch_separate_string(p, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) { for (x = 0; x < argc; x++) { if (!strncasecmp(argv[x], "alert", strlen(argv[x]))) { - levels[SWITCH_LOG_ALERT].on = 1; + profile->levels[SWITCH_LOG_ALERT].on = 1; } else if (!strncasecmp(argv[x], "crit", strlen(argv[x]))) { - levels[SWITCH_LOG_CRIT].on = 1; + profile->levels[SWITCH_LOG_CRIT].on = 1; } else if (!strncasecmp(argv[x], "error", strlen(argv[x]))) { - levels[SWITCH_LOG_ERROR].on = 1; + profile->levels[SWITCH_LOG_ERROR].on = 1; } else if (!strncasecmp(argv[x], "warn", strlen(argv[x]))) { - levels[SWITCH_LOG_WARNING].on = 1; + profile->levels[SWITCH_LOG_WARNING].on = 1; } else if (!strncasecmp(argv[x], "notice", strlen(argv[x]))) { - levels[SWITCH_LOG_NOTICE].on = 1; + profile->levels[SWITCH_LOG_NOTICE].on = 1; } else if (!strncasecmp(argv[x], "info", strlen(argv[x]))) { - levels[SWITCH_LOG_INFO].on = 1; + profile->levels[SWITCH_LOG_INFO].on = 1; } else if (!strncasecmp(argv[x], "debug", strlen(argv[x]))) { - levels[SWITCH_LOG_DEBUG].on = 1; + profile->levels[SWITCH_LOG_DEBUG].on = 1; } else if (!strncasecmp(argv[x], "console", strlen(argv[x]))) { - levels[SWITCH_LOG_CONSOLE].on = 1; + profile->levels[SWITCH_LOG_CONSOLE].on = 1; } else if (!strncasecmp(argv[x], "all", strlen(argv[x]))) { - int i; - for (i=0; i < (sizeof(levels) / sizeof(struct level_set)); i++) { - levels[i].on = 1; + for (i=0; i < (sizeof(profile->levels) / sizeof(struct level_set)); i++) { + profile->levels[i].on = 1; } } } @@ -238,7 +240,7 @@ { /* TODO: Handle multiple profiles */ - if (levels[node->level].on) { + if (default_profile->levels[node->level].on) { mod_logfile_raw_write(default_profile, node->data); } @@ -256,7 +258,7 @@ set_global_logfile(val); /* TODO: do this for multiple profiles */ } else if (!strcmp(var, "level")) { - process_levels(val); + process_levels(profile, val); } else if (!strcmp(var, "rollover")) { profile->roll_size = atoi(val); if (profile->roll_size < 0) {

1 0