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

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.
This commit is contained in:
Chad Phillips 2017-04-24 08:33:38 -05:00
parent 6a781a1e2c
commit cf1a0a5a51
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/applications/mod_conference/mod_conference.c
View File

@ -789,11 +789,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)) {
@ -831,6 +826,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);