[mod_amqp] configurable commands queue properties

diff --git a/conf/vanilla/autoload_configs/amqp.conf.xml b/conf/vanilla/autoload_configs/amqp.conf.xml
index d6c24f4ff77b1c21cae8eac474d290c39b7bb7e7..3db3c322326aef0a99af8227af2b10b9f804649d 100644 (file)
--- 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 0282c1a34c617afffc614346255cc4ebcebbe37c..53ea03836c56099d1154d8e302ac11258bfd73b1 100644 (file)
--- 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 dba6d20eb0cadcb0c34a5520b5aca75b63fc77b9..f467001f3d74c90e215ff498ae6117e1392c996b 100644 (file)
--- 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")) {