summaryrefslogtreecommitdiff
path: root/rest-api
diff options
context:
space:
mode:
authorKevin Harwell <kharwell@digium.com>2013-12-13 16:38:57 +0000
committerKevin Harwell <kharwell@digium.com>2013-12-13 16:38:57 +0000
commitce18946de46a6f16463391a9c07af02b8ee4e925 (patch)
tree3679fcee389fa7725b00389e6bd7f99cf058bb2e /rest-api
parentfc8c0ef28f669a53bcab3a862b4ef71b33665b2e (diff)
ARI: Adding a channel to a bridge while a live recording is active blocks
Added the ability to have rules that are checked when adding and/or removing channels to/from a bridge. In this case, if a channel is currently recording and someone attempts to add it to a bridge an "is recording" rule is checked, fails, and a 409 conflict is returned. Also command functions now return an integer value that can be descriptive of what kind of problems, if any, occurred before or during execution. (closes issue ASTERISK-22624) Reported by: Joshua Colp Review: https://reviewboard.asterisk.org/r/2947/ ........ Merged revisions 403749 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403750 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'rest-api')
-rw-r--r--rest-api/api-docs/bridges.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest-api/api-docs/bridges.json b/rest-api/api-docs/bridges.json
index 2339a9671..d7f63ad14 100644
--- a/rest-api/api-docs/bridges.json
+++ b/rest-api/api-docs/bridges.json
@@ -140,7 +140,7 @@
},
{
"code": 409,
- "reason": "Bridge not in Stasis application"
+ "reason": "Bridge not in Stasis application; Channel currently recording"
},
{
"code": 422,