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

remove file logging from automatically being set on the core console handle. You must now use mod_logfile to do file logging. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6509 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-12-04 23:18:24 +00:00
parent 552fd37e1c
commit 7b34d76091
3 changed files with 8 additions and 25 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(const char *console, switch_core_flag_t flags, const char **err);
SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, const char **err);
/*!
\brief Initilize the core and load modules
@ -251,7 +251,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(const char *console, switch_cor
\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(const char *console, switch_core_flag_t flags, const char **err);
SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(switch_core_flag_t flags, const char **err);
/*!
\brief Set/Get Session Limit

8
src/switch.c
View File

@ -43,10 +43,6 @@
#define PIDFILE "freeswitch.pid"
static char *pfile = PIDFILE;
/* log filename: Filename of the freeswitch log file to be used if we are in background mode */
#define LOGFILE "freeswitch.log"
static char *lfile = LOGFILE;
/* If we are a windows service, what should we be called */
#define SERVICENAME "Freeswitch"
@ -184,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(lfile, flags, &err) != SWITCH_STATUS_SUCCESS) {
if (switch_core_init_and_modload(flags, &err) != SWITCH_STATUS_SUCCESS) {
/* freeswitch did not start sucessfully */
status.dwCurrentState = SERVICE_STOPPED;
} else {
@ -422,7 +418,7 @@ int main(int argc, char *argv[])
}
#endif
if (switch_core_init_and_modload(nc ? lfile : NULL, flags, &err) != SWITCH_STATUS_SUCCESS) {
if (switch_core_init_and_modload(flags, &err) != SWITCH_STATUS_SUCCESS) {
fprintf(stderr, "Cannot Initilize [%s]\n", err);
return 255;
}

21
src/switch_core.c
View File

@ -641,7 +641,7 @@ static void load_mime_types(void)
}
SWITCH_DECLARE(switch_status_t) switch_core_init(const char *console, switch_core_flag_t flags, const char **err)
SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, const char **err)
{
switch_xml_t xml = NULL, cfg = NULL;
switch_uuid_t uuid;
@ -743,20 +743,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(const char *console, switch_cor
*err = NULL;
if (console) {
if (*console != '/') {
char path[265];
snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, console);
console = path;
}
if (switch_core_set_console(console) != SWITCH_STATUS_SUCCESS) {
*err = "FATAL ERROR! Could not open console\n";
apr_terminate();
return SWITCH_STATUS_GENERR;
}
} else {
runtime.console = stdout;
}
runtime.console = stdout;
assert(runtime.memory_pool != NULL);
switch_log_init(runtime.memory_pool);
@ -821,10 +808,10 @@ static void handle_SIGINT(int sig)
if (sig);
return;
}
SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(const char *console, switch_core_flag_t flags, const char **err)
SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(switch_core_flag_t flags, const char **err)
{
switch_event_t *event;
if (switch_core_init(console, flags, err) != SWITCH_STATUS_SUCCESS) {
if (switch_core_init(flags, err) != SWITCH_STATUS_SUCCESS) {
return SWITCH_STATUS_GENERR;
}