FS-10675: [mod_fifo] Wrap Up + fifo_caller_exit_key in mod_fifo #resolve

This commit is contained in:
Anthony Minessale 2017-09-18 17:23:45 -05:00
parent 5bb6e3485e
commit 503db7b23f

View File

@ -3575,7 +3575,6 @@ SWITCH_STANDARD_APP(fifo_function)
if (fifo_consumer_wrapup_time) {
wrapup_time_started = switch_micro_time_now();
}
if (!zstr(fifo_consumer_wrapup_key) && strcmp(buf, fifo_consumer_wrapup_key)) {
while (switch_channel_ready(channel)) {
@ -3596,7 +3595,7 @@ SWITCH_STANDARD_APP(fifo_function)
break;
}
}
} else if (fifo_consumer_wrapup_time && (zstr(fifo_consumer_wrapup_key) || !strcmp(buf, fifo_consumer_wrapup_key))) {
} else if ((zstr(fifo_consumer_wrapup_key) || !strcmp(buf, fifo_consumer_wrapup_key))) {
while (switch_channel_ready(channel)) {
wrapup_time_elapsed = (switch_micro_time_now() - wrapup_time_started) / 1000;
if (wrapup_time_elapsed > fifo_consumer_wrapup_time) {
@ -3605,6 +3604,8 @@ SWITCH_STANDARD_APP(fifo_function)
switch_yield(500);
}
}
}
switch_channel_set_variable(channel, "fifo_status", "WAITING");
}