X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Famqp.c;h=aba4f0122ca7c87ab4313da6cc3fd318872a9d88;hb=872126c9a7e0a8f8ae2b28217c12c27c35af5237;hp=187582c46885e080dc18937ecb7aca7a5d83d19d;hpb=1affe76577741c3ce45ffb052891b5d43ab3b000;p=collectd.git

diff --git a/src/amqp.c b/src/amqp.c
index 187582c4..aba4f012 100644
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -304,6 +304,10 @@ static int camqp_create_exchange (camqp_config_t *conf) /* {{{ */
             /* type        = */ amqp_cstring_bytes (conf->exchange_type),
             /* passive     = */ 0,
             /* durable     = */ 0,
+#if defined(AMQP_VERSION) && AMQP_VERSION >= 0x00060000
+            /* auto delete = */ 0,
+            /* internal    = */ 0,
+#endif
             /* arguments   = */ argument_table);
     if ((ed_ret == NULL) && camqp_is_error (conf))
     {
@@ -712,7 +716,7 @@ static void *camqp_subscribe_thread (void *user_data) /* {{{ */
             continue;
         }
 
-        status = camqp_read_header (conf);
+        camqp_read_header (conf);
 
         amqp_maybe_release_buffers (conf->connection);
     } /* while (subscriber_threads_running) */
@@ -940,7 +944,7 @@ static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */
     conf->password = NULL;
     conf->exchange = NULL;
     conf->routing_key = NULL;
-    conf->connection_retry_delay = 60;
+    conf->connection_retry_delay = 0;
 
     /* publish only */
     conf->delivery_mode = CAMQP_DM_VOLATILE;