kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-17 17:22:21 +00:00
Code Issues Projects Releases Wiki Activity

update

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1545 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-06-05 18:36:02 +00:00
parent e9563fbf5d
commit 5337872ce8
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/switch_core.h
View File

@ -111,9 +111,10 @@ struct switch_core_runtime;
/*! /*!
\brief Initilize the core \brief Initilize the core
\param console optional FILE stream for output \param console optional FILE stream for output
\param a pointer to set any errors to
\note to be called at application startup \note to be called at application startup
*/ */
SWITCH_DECLARE(switch_status_t) switch_core_init(char *console); SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err);
/*! /*!
\brief Destroy the core \brief Destroy the core

8
src/switch.c
View File

@ -70,7 +70,7 @@ int main(int argc, char *argv[])
char *pfile = "freeswitch.pid"; char *pfile = "freeswitch.pid";
char path[256] = ""; char path[256] = "";
char *ppath = NULL; char *ppath = NULL;
char *err = NULL; const char *err = NULL;
switch_event_t *event; switch_event_t *event;
int bg = 0; int bg = 0;
FILE *f; FILE *f;
@ -124,8 +124,8 @@ int main(int argc, char *argv[])
} }
if (switch_core_init(ppath) != SWITCH_STATUS_SUCCESS) { if (switch_core_init(ppath, &err) != SWITCH_STATUS_SUCCESS) {
fprintf(stderr, "Cannot Initilize\n"); fprintf(stderr, "Cannot Initilize [%s]\n", err);
return 255; return 255;
} }
@ -156,8 +156,6 @@ int main(int argc, char *argv[])
fprintf(f, "%d", getpid()); fprintf(f, "%d", getpid());
fclose(f); fclose(f);
if (!err) { if (!err) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Bringing up environment.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Bringing up environment.\n");

19
src/switch_core.c
View File

@ -2758,9 +2758,8 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
#endif #endif
} }
SWITCH_DECLARE(switch_status_t) switch_core_init(char *console) SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err)
{ {
const char *err = NULL;
memset(&runtime, 0, sizeof(runtime)); memset(&runtime, 0, sizeof(runtime));
switch_core_set_globals(); switch_core_set_globals();
@ -2768,29 +2767,35 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(char *console)
/* 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) {
apr_terminate(); apr_terminate();
fprintf(stderr, "FATAL ERROR! Could not initilize APR\n"); *err = "FATAL ERROR! Could not initilize APR\n";
return SWITCH_STATUS_MEMERR; return SWITCH_STATUS_MEMERR;
} }
if (apr_pool_create(&runtime.memory_pool, NULL) != SWITCH_STATUS_SUCCESS) { if (apr_pool_create(&runtime.memory_pool, NULL) != SWITCH_STATUS_SUCCESS) {
apr_terminate(); apr_terminate();
fprintf(stderr, "FATAL ERROR! Could not allocate memory pool\n"); *err = "FATAL ERROR! Could not allocate memory pool\n";
return SWITCH_STATUS_MEMERR; return SWITCH_STATUS_MEMERR;
} }
if (switch_xml_init(runtime.memory_pool, &err) != SWITCH_STATUS_SUCCESS) { if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) {
apr_terminate(); apr_terminate();
fprintf(stderr, "FATAL ERROR! Could not open XML Registry %s\n", err); *err = "FATAL ERROR! Could not open XML Registry %s\n";
return SWITCH_STATUS_MEMERR; return SWITCH_STATUS_MEMERR;
} }
*err = NULL;
if(console) { if(console) {
if (*console != '/') { if (*console != '/') {
char path[265]; char path[265];
snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, console); snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, console);
console = path; console = path;
} }
switch_core_set_console(console); if (switch_core_set_console(console) != SWITCH_STATUS_SUCCESS) {
*err = "FATAL ERROR! Could not open console\n";
apr_terminate();
return SWITCH_STATUS_GENERR;
}
} else { } else {
runtime.console = stdout; runtime.console = stdout;
} }