diff --git a/src/amqp.c b/src/amqp.c
index 7de9d7f2a5b861e3e39ef59457dcae33fc4b9514..39fbe744851a967b181a08fa35d3cb08faf88310 100644 (file)
--- a/src/amqp.c
+++ b/src/amqp.c
/* type = */ amqp_cstring_bytes (conf->exchange_type),
/* passive = */ 0,
/* durable = */ 0,
+#if AMQP_VERSION >= 0x00060000
+ /* auto delete = */ 0,
+ /* internal = */ 0,
+#endif
/* arguments = */ argument_table);
if ((ed_ret == NULL) && camqp_is_error (conf))
{
}
#ifdef HAVE_AMQP_TCP_SOCKET
-# define CLOSE_SOCKET() amqp_socket_close (socket)
+# define CLOSE_SOCKET() /* amqp_destroy_connection() closes the socket for us */
/* TODO: add support for SSL using amqp_ssl_socket_new
* and related functions */
socket = amqp_tcp_socket_new (conf->connection);
status *= -1;
ERROR ("amqp plugin: amqp_socket_open failed: %s",
sstrerror (status, errbuf, sizeof (errbuf)));
- CLOSE_SOCKET ();
amqp_destroy_connection (conf->connection);
conf->connection = NULL;
return (status);