[asterisk-dev] [Code Review] 2754: ARI: WebSocket event cleanup

[David Lee]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/2754/
-----------------------------------------------------------

(Updated Aug. 16, 2013, 10:52 a.m.)


Review request for Asterisk Developers and Matt Jordan.


Changes
-------

Updated to latest trunk (sorry; had merge conflicts to address)

Addressed review feedback
 * Removed bogus comment
 * Properly shut down/unsubscribe stasis apps
 * Check for empty application names (instead of just NULL)

Also fixed empty ?apps= handling on the websocket, which I found testing this update to the patch.


Bugs: ASTERISK-21969
    https://issues.asterisk.org/jira/browse/ASTERISK-21969


Repository: Asterisk


Description
-------

Stasis events (which get distributed over the ARI WebSocket) are created
by subscribing to the channel_all_cached and bridge_all_cached topics,
filtering out events for channels/bridges currently subscribed to.

There are two issues with that. First was a race condition, where
messages in-flight to the master subscribe-to-all-things topic would get
sent out, even though the events happened before the channel was put
into Stasis. Secondly, as the number of channels and bridges grow in the
system, the work spent filtering messages becomes excessive.

Since r395954, individual channels and bridges have caching topics, and
can be subscribed to individually. This patch takes advantage, so that
channels and bridges are subscribed to on demand, instead of filtering
the global topics.

The one case where filtering is still required is handling BridgeMerge
messages, which are published directly to the bridge_all topic.

Other than the change to how subscriptions work, this patch mostly just
moves code around. Most of the work generating JSON objects from
messages was moved to .to_json handlers on the message types. The
callback functions handling app subscriptions were moved from res_stasis
(b/c they were global to the model) to stasis/app.c (b/c they are local
to the app now).


Diffs (updated)
-----

  /trunk/main/stasis_bridges.c 396841 
  /trunk/res/res_ari_asterisk.c 396841 
  /trunk/res/res_ari_bridges.c 396841 
  /trunk/res/res_ari_events.c 396841 
  /trunk/res/res_stasis.c 396841 
  /trunk/res/stasis/app.h 396841 
  /trunk/res/stasis/app.c 396841 
  /trunk/rest-api-templates/param_parsing.mustache 396841 
  /trunk/rest-api-templates/res_ari_resource.c.mustache 396841 

Diff: https://reviewboard.asterisk.org/r/2754/diff/


Testing
-------

Put channels in/out of Stasis, and in/out of bridges, watching events on the
WebSocket.


Thanks,

David Lee

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20130816/e844f52c/attachment.htm>