Merge branch 'collectd-5.4' into collectd-5.5

[collectd.git] / src / amqp.c

diff --git a/src/amqp.c b/src/amqp.c
index dd5a652..4206bdc 100644 (file)
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -199,11 +199,11 @@ static char *camqp_strerror (camqp_config_t *conf, /* {{{ */
     switch (r.reply_type)
     {
         case AMQP_RESPONSE_NORMAL:
-            sstrncpy (buffer, "Success", sizeof (buffer));
+            sstrncpy (buffer, "Success", buffer_size);
             break;
 
         case AMQP_RESPONSE_NONE:
-            sstrncpy (buffer, "Missing RPC reply type", sizeof (buffer));
+            sstrncpy (buffer, "Missing RPC reply type", buffer_size);
             break;
 
         case AMQP_RESPONSE_LIBRARY_EXCEPTION:
@@ -215,7 +215,7 @@ static char *camqp_strerror (camqp_config_t *conf, /* {{{ */
                 return (sstrerror (r.library_error, buffer, buffer_size));
 #endif
             else
-                sstrncpy (buffer, "End of stream", sizeof (buffer));
+                sstrncpy (buffer, "End of stream", buffer_size);
             break;
 
         case AMQP_RESPONSE_SERVER_EXCEPTION:
@@ -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))
     {
@@ -408,7 +412,7 @@ static int camqp_setup_queue (camqp_config_t *conf) /* {{{ */
 
 static int camqp_connect (camqp_config_t *conf) /* {{{ */
 {
-    static time_t lastConnectTime = 0;
+    static time_t last_connect_time = 0;
 
     amqp_rpc_reply_t reply;
     int status;
@@ -422,16 +426,16 @@ static int camqp_connect (camqp_config_t *conf) /* {{{ */
         return (0);
 
     time_t now = time(NULL);
-    if (now < (lastConnectTime + conf->connection_retry_delay))
+    if (now < (last_connect_time + conf->connection_retry_delay))
     {
-        DEBUG("amqp plugin: skipping connection retry, ConnectionRetryDelay: %d"
-                , conf->connection_retry_delay);
+        DEBUG("amqp plugin: skipping connection retry, "
+            "ConnectionRetryDelay: %d", conf->connection_retry_delay);
         return(1);
     }
     else
     {
         DEBUG ("amqp plugin: retrying connection");
-        lastConnectTime = now;
+        last_connect_time = now;
     }
 
     conf->connection = amqp_new_connection ();
@@ -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;