kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

only set console when we have a console 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6535 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-12-06 13:40:00 +00:00
parent 8a01509d13
commit 18ca278d9b
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/switch_core.h
View File

@ -242,7 +242,7 @@ SWITCH_DECLARE(void) switch_core_port_allocator_destroy(switch_core_port_allocat
\param err a pointer to set any errors to
\note to be called at application startup
*/
SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, const char **err);
SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switch_bool_t console, const char **err);
/*!
\brief Initilize the core and load modules
@ -251,7 +251,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, const
\param err a pointer to set any errors to
\note to be called at application startup instead of switch_core_init. Includes module loading.
*/
SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(switch_core_flag_t flags, const char **err);
SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(switch_core_flag_t flags, switch_bool_t console, const char **err);
/*!
\brief Set/Get Session Limit

4
src/switch.c
View File

@ -180,7 +180,7 @@ void WINAPI service_main(DWORD numArgs, char **args)
set_high_priority();
/* attempt to initialize freeswitch and load modules */
if (switch_core_init_and_modload(flags, &err) != SWITCH_STATUS_SUCCESS) {
if (switch_core_init_and_modload(flags, SWITCH_FALSE, &err) != SWITCH_STATUS_SUCCESS) {
/* freeswitch did not start sucessfully */
status.dwCurrentState = SERVICE_STOPPED;
} else {
@ -416,7 +416,7 @@ int main(int argc, char *argv[])
}
#endif
if (switch_core_init_and_modload(flags, &err) != SWITCH_STATUS_SUCCESS) {
if (switch_core_init_and_modload(flags, nc ? SWITCH_FALSE : SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) {
fprintf(stderr, "Cannot Initilize [%s]\n", err);
return 255;
}

10
src/switch_core.c
View File

@ -641,7 +641,7 @@ static void load_mime_types(void)
}
SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, const char **err)
SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switch_bool_t console, const char **err)
{
switch_xml_t xml = NULL, cfg = NULL;
switch_uuid_t uuid;
@ -743,7 +743,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, const
*err = NULL;
runtime.console = stdout;
if (console) {
runtime.console = stdout;
}
assert(runtime.memory_pool != NULL);
switch_log_init(runtime.memory_pool);
@ -808,10 +810,10 @@ static void handle_SIGINT(int sig)
if (sig);
return;
}
SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(switch_core_flag_t flags, const char **err)
SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(switch_core_flag_t flags, switch_bool_t console, const char **err)
{
switch_event_t *event;
if (switch_core_init(flags, err) != SWITCH_STATUS_SUCCESS) {
if (switch_core_init(flags, console, err) != SWITCH_STATUS_SUCCESS) {
return SWITCH_STATUS_GENERR;
}

4
src/switch_log.c
View File

@ -247,7 +247,9 @@ SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char
}
} else {
if (level == SWITCH_LOG_CONSOLE || !LOG_QUEUE || !THREAD_RUNNING) {
fprintf(handle, "%s", data);
if (handle) {
fprintf(handle, "%s", data);
}
free(data);
} else if (level <= MAX_LEVEL) {
switch_log_node_t *node;