kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-14 19:16:59 +00:00
Code Issues Projects Releases Wiki Activity

fix startup race

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5502 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-07-06 16:29:25 +00:00
parent fc1cd4e38b
commit d04d8ffea1
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/switch_core.c
View File

@ -398,6 +398,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(const char *console, const char
switch_uuid_t uuid; switch_uuid_t uuid;
memset(&runtime, 0, sizeof(runtime)); memset(&runtime, 0, sizeof(runtime));
runtime.no_new_sessions = 1;
/* INIT APR and Create the pool context */ /* INIT APR and Create the pool context */
if (apr_initialize() != SWITCH_STATUS_SUCCESS) { if (apr_initialize() != SWITCH_STATUS_SUCCESS) {
*err = "FATAL ERROR! Could not initilize APR\n"; *err = "FATAL ERROR! Could not initilize APR\n";
@ -577,6 +579,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(const char *console
"\nFreeSWITCH Version %s Started.\nCrash Protection [%s]\nMax Sessions[%u]\n\n", SWITCH_VERSION_FULL, "\nFreeSWITCH Version %s Started.\nCrash Protection [%s]\nMax Sessions[%u]\n\n", SWITCH_VERSION_FULL,
runtime.crash_prot ? "Enabled" : "Disabled", runtime.crash_prot ? "Enabled" : "Disabled",
switch_core_session_limit(0)); switch_core_session_limit(0));
runtime.no_new_sessions = 0;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }

10
src/switch_core_session.c
View File

@ -767,7 +767,10 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch
switch_uuid_t uuid; switch_uuid_t uuid;
uint32_t count = 0; uint32_t count = 0;
assert(endpoint_interface != NULL); if (!switch_core_ready() || endpoint_interface == NULL) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "The system cannot create any sessions at this time.\n");
return NULL;
}
switch_mutex_lock(session_manager.session_table_mutex); switch_mutex_lock(session_manager.session_table_mutex);
count = session_manager.session_count; count = session_manager.session_count;
@ -778,11 +781,6 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch
return NULL; return NULL;
} }
if (!switch_core_ready()) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read my lips: no new sessions!\n");
return NULL;
}
if (pool && *pool) { if (pool && *pool) {
usepool = *pool; usepool = *pool;
*pool = NULL; *pool = NULL;