kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

manager: Remove AMI "Queues" action.

Browse Source 
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
This commit is contained in:
Benjamin Keith Ford
2017-07-05 12:44:18 -05:00
parent 366971827a
commit 5d86da61a6
1 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/app_queue.c
View File

@@ -793,16 +793,6 @@
<ref type="function">QUEUE_MEMBER_PENALTY</ref>
</see-also>
</function>
<manager name="Queues" language="en_US">
<synopsis>
Queues.
</synopsis>
<syntax>
</syntax>
<description>
<para>Show queues information.</para>
</description>
</manager>
<manager name="QueueStatus" language="en_US">
<synopsis>
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);