From 5244a64d4e609eebb97d069a82317c276d677288 Mon Sep 17 00:00:00 2001
From: cdosoftei <ciprian.dosoftei@gmail.com>
Date: Tue, 22 Oct 2019 15:22:00 -0400
Subject: [PATCH] [mod_amqp] configurable commands queue properties

---
 conf/vanilla/autoload_configs/amqp.conf.xml   |  4 ++++
 src/mod/event_handlers/mod_amqp/mod_amqp.h    |  6 ++++++
 .../mod_amqp/mod_amqp_command.c               | 20 +++++++++++++++++--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/conf/vanilla/autoload_configs/amqp.conf.xml b/conf/vanilla/autoload_configs/amqp.conf.xml
index d6c24f4ff7..3db3c32232 100644
--- a/conf/vanilla/autoload_configs/amqp.conf.xml
+++ b/conf/vanilla/autoload_configs/amqp.conf.xml
@@ -57,6 +57,10 @@
 	<param name="exchange-name" value="TAP.Commands"/>
 	<param name="binding_key" value="commandBindingKey"/>
 	<param name="reconnect_interval_ms" value="1000"/>
+	<param name="queue-passive" value="false"/>
+	<param name="queue-durable" value="false"/>
+	<param name="queue-exclusive" value="false"/>
+	<param name="queue-auto-delete" value="true"/>
       </params>
     </profile>
   </commands>
diff --git a/src/mod/event_handlers/mod_amqp/mod_amqp.h b/src/mod/event_handlers/mod_amqp/mod_amqp.h
index 0282c1a34c..53ea03836c 100644
--- a/src/mod/event_handlers/mod_amqp/mod_amqp.h
+++ b/src/mod/event_handlers/mod_amqp/mod_amqp.h
@@ -134,6 +134,12 @@ typedef struct {
   char *queue;
   char *binding_key;
 
+  /* Queue properties */
+  switch_bool_t passive;
+  switch_bool_t durable;
+  switch_bool_t exclusive;
+  switch_bool_t auto_delete;
+
   /* Note: The AMQP channel is not reentrant this MUTEX serializes sending events. */
   mod_amqp_connection_t *conn_root;
   mod_amqp_connection_t *conn_active;
diff --git a/src/mod/event_handlers/mod_amqp/mod_amqp_command.c b/src/mod/event_handlers/mod_amqp/mod_amqp_command.c
index dba6d20eb0..f467001f3d 100644
--- a/src/mod/event_handlers/mod_amqp/mod_amqp_command.c
+++ b/src/mod/event_handlers/mod_amqp/mod_amqp_command.c
@@ -121,6 +121,12 @@ switch_status_t mod_amqp_command_create(char *name, switch_xml_t cfg)
                 goto err;
 	}
 
+	/* Default queue properties, set to match formerly hardcoded values */
+	profile->passive = SWITCH_FALSE;
+	profile->durable = SWITCH_FALSE;
+	profile->exclusive = SWITCH_FALSE;
+	profile->auto_delete = SWITCH_TRUE;
+
 	if ((params = switch_xml_child(cfg, "params")) != NULL) {
 		for (param = switch_xml_child(params, "param"); param; param = param->next) {
 			char *var = (char *) switch_xml_attr_soft(param, "name");
@@ -147,6 +153,14 @@ switch_status_t mod_amqp_command_create(char *name, switch_xml_t cfg)
 				queue = mod_amqp_expand_header(profile->pool, event, val);
 			} else if (!strncmp(var, "binding_key", 11)) {
 				binding_key = mod_amqp_expand_header(profile->pool, event, val);
+			} else if (!strncmp(var, "queue-passive", 13)) {
+				profile->passive = switch_true(val);
+			} else if (!strncmp(var, "queue-durable", 13)) {
+				profile->durable = switch_true(val);
+			} else if (!strncmp(var, "queue-exclusive", 15)) {
+				profile->exclusive = switch_true(val);
+			} else if (!strncmp(var, "queue-auto-delete", 17)) {
+				profile->auto_delete = switch_true(val);
 			}
 		}
 	}
@@ -308,8 +322,10 @@ void * SWITCH_THREAD_FUNC mod_amqp_command_thread(switch_thread_t *thread, void
 			recv_queue = amqp_queue_declare(profile->conn_active->state, // state
 											1,                           // channel
 											profile->queue ? amqp_cstring_bytes(profile->queue) : amqp_empty_bytes, // queue name
-											0, 0,                        // passive, durable
-											0, 1,                        // exclusive, auto-delete
+											profile->passive,
+											profile->durable,
+											profile->exclusive,
+											profile->auto_delete,
 											amqp_empty_table);           // args
 
 			if (mod_amqp_log_if_amqp_error(amqp_get_rpc_reply(profile->conn_active->state), "Declaring queue\n")) {