[Freeswitch-svn] [commit] r7776 - freeswitch/trunk/src

Freeswitch SVN mikej at freeswitch.org
Mon Mar 3 15:51:51 EST 2008


Author: mikej
Date: Mon Mar  3 15:51:50 2008
New Revision: 7776

Modified:
   freeswitch/trunk/src/switch_core.c

Log:
initialize event engine and logs earlier

Modified: freeswitch/trunk/src/switch_core.c
==============================================================================
--- freeswitch/trunk/src/switch_core.c	(original)
+++ freeswitch/trunk/src/switch_core.c	Mon Mar  3 15:51:50 2008
@@ -726,6 +726,9 @@
 	switch_core_set_variable("local_ip_v6", guess_ip);
 	switch_core_set_variable("base_dir", SWITCH_GLOBAL_dirs.base_dir);
 
+	switch_log_init(runtime.memory_pool);
+	switch_event_init(runtime.memory_pool);
+
 	if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) {
 		apr_terminate();
 		return SWITCH_STATUS_MEMERR;
@@ -803,10 +806,6 @@
 		runtime.console = stdout;
 	}
 
-	switch_assert(runtime.memory_pool != NULL);
-	switch_log_init(runtime.memory_pool);
-	switch_event_init(runtime.memory_pool);
-
 	if (switch_test_flag((&runtime), SCF_USE_SQL)) {
 		switch_core_sqldb_start(runtime.memory_pool);
 	}



More information about the Freeswitch-svn mailing list