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

Merge pull request #1221 in FS/freeswitch from ~NBLASGEN/freeswitch:feature/FS-10084-mod_v8-block-for-event to master 

* commit 'd9c6ebc8031ef665f0332b3832030d8cb95b61b7':
  FS-10084 [mod_v8] Fixed incorrect variable name
  FS-10084 [mod_v8] If the value passed is negative, block until event is received
This commit is contained in:
Mike Jerris 2017-06-06 18:40:58 +00:00
parent 690f7cbe9f d9c6ebc803
commit 95c7fb0155
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/languages/mod_v8/src/fseventhandler.cpp
View File

@ -336,6 +336,10 @@ JS_EVENTHANDLER_FUNCTION_IMPL(GetEvent)
if (switch_queue_pop_timeout(_event_queue, &pop, (switch_interval_time_t) timeout * 1000) == SWITCH_STATUS_SUCCESS && pop) {
pevent = (switch_event_t *) pop;
}
} else if (timeout < 0) {
if (switch_queue_pop(_event_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
pevent = (switch_event_t *) pop;
}
} else {
if (switch_queue_trypop(_event_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
pevent = (switch_event_t *) pop;