]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
initialize event engine and logs earlier
authorMichael Jerris <mike@jerris.com>
Mon, 3 Mar 2008 20:51:50 +0000 (20:51 +0000)
committerMichael Jerris <mike@jerris.com>
Mon, 3 Mar 2008 20:51:50 +0000 (20:51 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7776 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/switch_core.c

index f8494806a1f0d623d62dc9db3ceb723f6ed1902d..9ea08336581a40afa0eefdc2b472e8f578c7b13c 100644 (file)
@@ -726,6 +726,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
        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 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
                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);
        }