<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/5929">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
Kevin Harwell: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">manager: Remove AMI "Queues" action.<br><br>When performing the "Queues" action via AMI, it outputs the same<br>text that the Asterisk CLI outputs when running a "queue show"<br>command, which does not conform with the AMI spec. "QueueStatus"<br>already does what the "Queues" action should do, so instead of<br>correcting the output, the "Queues" action will be removed and<br>"QueueStatus" should be used instead.<br><br>ASTERISK-27073 #close<br>Reported by: Brian<br><br>Change-Id: Id11743859758255b69cc3a557750d7a56c6d16f8<br>---<br>M apps/app_queue.c<br>1 file changed, 0 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/apps/app_queue.c b/apps/app_queue.c<br>index f158a4c..4fbd5f3 100644<br>--- a/apps/app_queue.c<br>+++ b/apps/app_queue.c<br>@@ -793,16 +793,6 @@<br> <ref type="function">QUEUE_MEMBER_PENALTY</ref><br> </see-also><br> </function><br>- <manager name="Queues" language="en_US"><br>- <synopsis><br>- Queues.<br>- </synopsis><br>- <syntax><br>- </syntax><br>- <description><br>- <para>Show queues information.</para><br>- </description><br>- </manager><br> <manager name="QueueStatus" language="en_US"><br> <synopsis><br> Show queue status.<br>@@ -9728,19 +9718,6 @@<br> return __queues_show(NULL, a->fd, a->argc, a->argv);<br> }<br> <br>-/*!\brief callback to display queues status in manager<br>- \addtogroup Group_AMI<br>- */<br>-static int manager_queues_show(struct mansession *s, const struct message *m)<br>-{<br>- static const char * const a[] = { "queue", "show" };<br>-<br>- __queues_show(s, -1, 2, a);<br>- astman_append(s, "\r\n\r\n"); /* Properly terminate Manager output */<br>-<br>- return RESULT_SUCCESS;<br>-}<br>-<br> static int manager_queue_rule_show(struct mansession *s, const struct message *m)<br> {<br> const char *rule = astman_get_header(m, "Rule");<br>@@ -11191,7 +11168,6 @@<br> <br> ast_cli_unregister_multiple(cli_queue, ARRAY_LEN(cli_queue));<br> ast_manager_unregister("QueueStatus");<br>- ast_manager_unregister("Queues");<br> ast_manager_unregister("QueueRule");<br> ast_manager_unregister("QueueSummary");<br> ast_manager_unregister("QueueAdd");<br>@@ -11309,7 +11285,6 @@<br> err |= ast_register_application_xml(app_upqm, upqm_exec);<br> err |= ast_register_application_xml(app_ql, ql_exec);<br> err |= ast_register_application_xml(app_qupd, qupd_exec);<br>- err |= ast_manager_register_xml("Queues", 0, manager_queues_show);<br> err |= ast_manager_register_xml("QueueStatus", 0, manager_queues_status);<br> err |= ast_manager_register_xml("QueueSummary", 0, manager_queues_summary);<br> err |= ast_manager_register_xml("QueueAdd", EVENT_FLAG_AGENT, manager_add_queue_member);<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/5929">change 5929</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/5929"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id11743859758255b69cc3a557750d7a56c6d16f8 </div>
<div style="display:none"> Gerrit-Change-Number: 5929 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>