kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-12 18:27:06 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/include/test/switch_test.h
View File

@ -66,7 +66,7 @@ static char *fst_getenv_default(const char *env, char *default_value, switch_boo
/** /**
* initialize FS core from optional configuration dir * initialize FS core from optional configuration dir
*/ */
static void fst_init_core_and_modload(const char *confdir, const char *basedir, int minimal) static switch_status_t fst_init_core_and_modload(const char *confdir, const char *basedir, int minimal)
{ {
const char *err; const char *err;
// Let FreeSWITCH core pick these // Let FreeSWITCH core pick these
@ -112,12 +112,12 @@ static void fst_init_core_and_modload(const char *confdir, const char *basedir,
switch_core_set_globals(); switch_core_set_globals();
if (!minimal) { if (!minimal) {
switch_core_init_and_modload(0, SWITCH_TRUE, &err); switch_status_t status = switch_core_init_and_modload(0, SWITCH_TRUE, &err);
switch_sleep(1 * 1000000); switch_sleep(1 * 1000000);
switch_core_set_variable("sound_prefix", "." SWITCH_PATH_SEPARATOR); switch_core_set_variable("sound_prefix", "." SWITCH_PATH_SEPARATOR);
} else { return status;
switch_core_init(SCF_MINIMAL, SWITCH_TRUE, &err);
} }
return switch_core_init(SCF_MINIMAL, SWITCH_TRUE, &err);
} }
/** /**
@ -248,12 +248,17 @@ static void fst_init_core_and_modload(const char *confdir, const char *basedir,
#define FST_CORE_BEGIN(confdir) \ #define FST_CORE_BEGIN(confdir) \
FCT_BGN() \ FCT_BGN() \
{ \ { \
int fst_core = 2; \ int fst_core = 0; \
switch_time_t fst_time_start = 0; \ switch_time_t fst_time_start = 0; \
switch_timer_t fst_timer = { 0 }; \ switch_timer_t fst_timer = { 0 }; \
switch_memory_pool_t *fst_pool = NULL; \ switch_memory_pool_t *fst_pool = NULL; \
fst_getenv_default("FST_SUPPRESS_UNUSED_STATIC_WARNING", NULL, SWITCH_FALSE); \ fst_getenv_default("FST_SUPPRESS_UNUSED_STATIC_WARNING", NULL, SWITCH_FALSE); \
fst_init_core_and_modload(confdir, NULL, 0); \ if (fst_init_core_and_modload(confdir, NULL, 0) == SWITCH_STATUS_SUCCESS) { \
fst_core = 2; \
} else { \
fprintf(stderr, "Failed to load FS core\n"); \
exit(1); \
} \
{ {
@ -276,12 +281,17 @@ static void fst_init_core_and_modload(const char *confdir, const char *basedir,
#define FST_MINCORE_BEGIN() \ #define FST_MINCORE_BEGIN() \
FCT_BGN() \ FCT_BGN() \
{ \ { \
int fst_core = 1; \ int fst_core = 0; \
switch_time_t fst_time_start = 0; \ switch_time_t fst_time_start = 0; \
switch_timer_t fst_timer = { 0 }; \ switch_timer_t fst_timer = { 0 }; \
switch_memory_pool_t *fst_pool = NULL; \ switch_memory_pool_t *fst_pool = NULL; \
fst_getenv_default("FST_SUPPRESS_UNUSED_STATIC_WARNING", NULL, SWITCH_FALSE); \ fst_getenv_default("FST_SUPPRESS_UNUSED_STATIC_WARNING", NULL, SWITCH_FALSE); \
fst_init_core_and_modload(".", NULL, 1); /* minimal load */ \ if (fst_init_core_and_modload(".", NULL, 1) == SWITCH_STATUS_SUCCESS) { /* minimal load */ \
fst_core = 1; \
} else { \
fprintf(stderr, "Failed to load FS core\n"); \
exit(1); \
} \
{ {
#define FST_MINCORE_END FST_CORE_END #define FST_MINCORE_END FST_CORE_END

3
src/switch_core.c
View File

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