提交 52226706 authored 作者: Chad Phillips's avatar Chad Phillips 提交者: Mike Jerris

FS-10261: Fire conference-destroy event later

The conference-destroy event can fire later, after more conference shutdown
operations are complete, such as closing open recording files.
上级 4dec277e
...@@ -770,11 +770,6 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob ...@@ -770,11 +770,6 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob
switch_cond_next(); switch_cond_next();
} }
switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT);
conference_event_add_data(conference, event);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "conference-destroy");
switch_event_fire(&event);
switch_core_timer_destroy(&timer); switch_core_timer_destroy(&timer);
switch_mutex_lock(conference_globals.hash_mutex); switch_mutex_lock(conference_globals.hash_mutex);
if (conference_utils_test_flag(conference, CFLAG_INHASH)) { if (conference_utils_test_flag(conference, CFLAG_INHASH)) {
...@@ -812,6 +807,12 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob ...@@ -812,6 +807,12 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob
} }
conference->end_time = switch_epoch_time_now(NULL); conference->end_time = switch_epoch_time_now(NULL);
switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT);
conference_event_add_data(conference, event);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "conference-destroy");
switch_event_fire(&event);
conference_cdr_render(conference); conference_cdr_render(conference);
switch_mutex_lock(conference_globals.setup_mutex); switch_mutex_lock(conference_globals.setup_mutex);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论