From 5d86da61a66989507e91bed4930a39faba97638a Mon Sep 17 00:00:00 2001 From: Benjamin Keith Ford Date: Wed, 5 Jul 2017 12:44:18 -0500 Subject: [PATCH] manager: Remove AMI "Queues" action. When performing the "Queues" action via AMI, it outputs the same text that the Asterisk CLI outputs when running a "queue show" command, which does not conform with the AMI spec. "QueueStatus" already does what the "Queues" action should do, so instead of correcting the output, the "Queues" action will be removed and "QueueStatus" should be used instead. ASTERISK-27073 #close Reported by: Brian Change-Id: Id11743859758255b69cc3a557750d7a56c6d16f8 --- apps/app_queue.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/apps/app_queue.c b/apps/app_queue.c index f158a4caa8..4fbd5f3c0f 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -793,16 +793,6 @@ QUEUE_MEMBER_PENALTY - - - Queues. - - - - - Show queues information. - - Show queue status. @@ -9728,19 +9718,6 @@ static char *queue_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a return __queues_show(NULL, a->fd, a->argc, a->argv); } -/*!\brief callback to display queues status in manager - \addtogroup Group_AMI - */ -static int manager_queues_show(struct mansession *s, const struct message *m) -{ - static const char * const a[] = { "queue", "show" }; - - __queues_show(s, -1, 2, a); - astman_append(s, "\r\n\r\n"); /* Properly terminate Manager output */ - - return RESULT_SUCCESS; -} - static int manager_queue_rule_show(struct mansession *s, const struct message *m) { const char *rule = astman_get_header(m, "Rule"); @@ -11191,7 +11168,6 @@ static int unload_module(void) ast_cli_unregister_multiple(cli_queue, ARRAY_LEN(cli_queue)); ast_manager_unregister("QueueStatus"); - ast_manager_unregister("Queues"); ast_manager_unregister("QueueRule"); ast_manager_unregister("QueueSummary"); ast_manager_unregister("QueueAdd"); @@ -11309,7 +11285,6 @@ static int load_module(void) err |= ast_register_application_xml(app_upqm, upqm_exec); err |= ast_register_application_xml(app_ql, ql_exec); err |= ast_register_application_xml(app_qupd, qupd_exec); - err |= ast_manager_register_xml("Queues", 0, manager_queues_show); err |= ast_manager_register_xml("QueueStatus", 0, manager_queues_status); err |= ast_manager_register_xml("QueueSummary", 0, manager_queues_summary); err |= ast_manager_register_xml("QueueAdd", EVENT_FLAG_AGENT, manager_add_queue_member);