diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-10-04 16:01:48 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-10-04 16:01:48 +0000 |
| commit | 8d7873b836999b09caad87abec27579f1f065b84 (patch) | |
| tree | cdf683ab18142553b42102de6c5ca52fc71b22a2 /main/json.c | |
| parent | b52c972b172087d27178c0e60127d486d4e500f8 (diff) | |
ARI: Add subscription support
This patch adds an /applications API to ARI, allowing explicit management of
Stasis applications.
* GET /applications - list current applications
* GET /applications/{applicationName} - get details of a specific application
* POST /applications/{applicationName}/subscription - explicitly subscribe to
a channel, bridge or endpoint
* DELETE /applications/{applicationName}/subscription - explicitly unsubscribe
from a channel, bridge or endpoint
Subscriptions work by a reference counting mechanism: if you subscript to an
event source X number of times, you must unsubscribe X number of times to stop
receiveing events for that event source.
Review: https://reviewboard.asterisk.org/r/2862
(issue ASTERISK-22451)
Reported by: Matt Jordan
........
Merged revisions 400522 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400523 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/json.c')
| -rw-r--r-- | main/json.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/main/json.c b/main/json.c index e3ef3d001..ce4c6cfc9 100644 --- a/main/json.c +++ b/main/json.c @@ -686,9 +686,15 @@ struct ast_json *ast_json_pack(char const *format, ...) } struct ast_json *ast_json_vpack(char const *format, va_list ap) { + json_error_t error; struct ast_json *r = NULL; if (format) { - r = (struct ast_json *)json_vpack_ex(NULL, 0, format, ap); + r = (struct ast_json *)json_vpack_ex(&error, 0, format, ap); + if (!r) { + ast_log(LOG_ERROR, + "Error building JSON from '%s': %s.\n", + format, error.text); + } } return r; } |