Make app_queue AMI events more consistent. Give Join/Leave more useful names.

This also removes the eventwhencalled and eventmemberstatus configuration
options.  These events can just be filtered via manager.conf blacklists.

(closes issue ASTERISK-21469)
Review: https://reviewboard.asterisk.org/r/2586/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@390901 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2013-06-07 19:51:19 +00:00
parent f19ff9579a
commit a2d02edca5
4 changed files with 727 additions and 582 deletions

View File

@@ -1287,7 +1287,24 @@ struct ast_str *ast_manager_str_from_json_object(struct ast_json *blob, key_excl
if (exclusion_cb && exclusion_cb(key)) {
continue;
}
ast_str_append(&output_str, 0, "%s: %s\r\n", key, ast_json_string_get(value));
switch (ast_json_typeof(value)) {
case AST_JSON_STRING:
ast_str_append(&output_str, 0, "%s: %s\r\n", key, ast_json_string_get(value));
break;
case AST_JSON_INTEGER:
ast_str_append(&output_str, 0, "%s: %jd\r\n", key, ast_json_integer_get(value));
break;
case AST_JSON_TRUE:
ast_str_append(&output_str, 0, "%s: True\r\n", key);
break;
case AST_JSON_FALSE:
ast_str_append(&output_str, 0, "%s: False\r\n", key);
break;
default:
ast_str_append(&output_str, 0, "%s: \r\n", key);
break;
}
if (!output_str) {
return NULL;
}