kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 17:38:59 +00:00
Code Issues Projects Releases Wiki Activity

fix order of ops to enable logging sooner

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13556 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2009-06-02 22:03:33 +00:00
parent f2495ec8e0
commit 4577ec8788
3 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/switch_core.c
View File

@@ -1176,6 +1176,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
runtime.flags = flags;
runtime.sps_total = 30;
*err = NULL;
if (console) {
runtime.console = stdout;
}
switch_find_local_ip(guess_ip, sizeof(guess_ip), &mask, AF_INET);
switch_core_set_variable("local_ip_v4", guess_ip);
switch_core_set_variable("local_mask_v4", inet_ntoa(*(struct in_addr *)&mask));
@@ -1188,26 +1194,22 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
switch_event_init(runtime.memory_pool);
if (switch_test_flag((&runtime), SCF_USE_AUTO_NAT)) {
switch_nat_init(runtime.memory_pool);
}
if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) {
apr_terminate();
return SWITCH_STATUS_MEMERR;
}
if (switch_test_flag((&runtime), SCF_USE_AUTO_NAT)) {
switch_nat_init(runtime.memory_pool);
}
switch_log_init(runtime.memory_pool, runtime.colorize_console);
switch_load_core_config("switch.conf");
switch_log_init(runtime.memory_pool, runtime.colorize_console);
switch_core_state_machine_init(runtime.memory_pool);
*err = NULL;
if (console) {
runtime.console = stdout;
}
if (switch_test_flag((&runtime), SCF_USE_SQL)) {
switch_core_sqldb_start(runtime.memory_pool);
}