kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-14 01:49:05 +00:00
Code Issues Projects Releases Wiki Activity

FS-11725 [core,test] Fix switch_core to allow MINIMAL core to load without freeswitch.xml. Fix test framework to exit if FreeSWITCH core fails to load.

Browse Source
This commit is contained in:
Chris Rienzo
2019-03-22 16:59:26 +00:00
committed by Andrey Volk
parent 1d68ab18f4
commit 824356cc94
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/switch_core.c
View File

@@ -1992,8 +1992,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
switch_channel_global_init(runtime.memory_pool);
if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) {
apr_terminate();
return SWITCH_STATUS_MEMERR;
/* allow missing configuration if MINIMAL */
if (!(flags & SCF_MINIMAL)) {
apr_terminate();
return SWITCH_STATUS_MEMERR;
}
}
if (switch_test_flag((&runtime), SCF_USE_AUTO_NAT)) {