diff --git a/src/amqp.c b/src/amqp.c
index dd5a65267a1212622b2b66097a01e650c6fe8a99..4206bdc1e3ee36b99192452b377943e007fb8af8 100644 (file)
--- a/src/amqp.c
+++ b/src/amqp.c
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:
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:
/* 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))
{
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;
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 ();
continue;
}
- status = camqp_read_header (conf);
+ camqp_read_header (conf);
amqp_maybe_release_buffers (conf->connection);
} /* while (subscriber_threads_running) */
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;