projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5'
[collectd.git]
/
src
/
amqp.c
diff --git
a/src/amqp.c
b/src/amqp.c
index
dd5a652
..
fc69e93
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:
switch (r.reply_type)
{
case AMQP_RESPONSE_NORMAL:
- sstrncpy (buffer, "Success",
sizeof (buffer)
);
+ sstrncpy (buffer, "Success",
buffer_size
);
break;
case AMQP_RESPONSE_NONE:
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:
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
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:
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,
/* 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))
{
/* 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 int camqp_connect (camqp_config_t *conf) /* {{{ */
{
- static time_t last
ConnectT
ime = 0;
+ static time_t last
_connect_t
ime = 0;
amqp_rpc_reply_t reply;
int status;
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);
return (0);
time_t now = time(NULL);
- if (now < (last
ConnectT
ime + conf->connection_retry_delay))
+ if (now < (last
_connect_t
ime + 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");
return(1);
}
else
{
DEBUG ("amqp plugin: retrying connection");
- last
ConnectT
ime = now;
+ last
_connect_t
ime = now;
}
conf->connection = amqp_new_connection ();
}
conf->connection = amqp_new_connection ();
@@
-712,7
+716,7
@@
static void *camqp_subscribe_thread (void *user_data) /* {{{ */
continue;
}
continue;
}
-
status =
camqp_read_header (conf);
+ camqp_read_header (conf);
amqp_maybe_release_buffers (conf->connection);
} /* while (subscriber_threads_running) */
amqp_maybe_release_buffers (conf->connection);
} /* while (subscriber_threads_running) */
@@
-732,7
+736,7
@@
static int camqp_subscribe_init (camqp_config_t *conf) /* {{{ */
if (tmp == NULL)
{
ERROR ("amqp plugin: realloc failed.");
if (tmp == NULL)
{
ERROR ("amqp plugin: realloc failed.");
-
camqp_config_free (conf
);
+
sfree (subscriber_threads
);
return (ENOMEM);
}
subscriber_threads = tmp;
return (ENOMEM);
}
subscriber_threads = tmp;
@@
-746,7
+750,6
@@
static int camqp_subscribe_init (camqp_config_t *conf) /* {{{ */
char errbuf[1024];
ERROR ("amqp plugin: pthread_create failed: %s",
sstrerror (status, errbuf, sizeof (errbuf)));
char errbuf[1024];
ERROR ("amqp plugin: pthread_create failed: %s",
sstrerror (status, errbuf, sizeof (errbuf)));
- camqp_config_free (conf);
return (status);
}
return (status);
}
@@
-921,15
+924,14
@@
static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */
int status;
int i;
int status;
int i;
- conf =
malloc (
sizeof (*conf));
+ conf =
calloc (1,
sizeof (*conf));
if (conf == NULL)
{
if (conf == NULL)
{
- ERROR ("amqp plugin:
m
alloc failed.");
+ ERROR ("amqp plugin:
c
alloc failed.");
return (ENOMEM);
}
/* Initialize "conf" {{{ */
return (ENOMEM);
}
/* Initialize "conf" {{{ */
- memset (conf, 0, sizeof (*conf));
conf->publish = publish;
conf->name = NULL;
conf->format = CAMQP_FORMAT_COMMAND;
conf->publish = publish;
conf->name = NULL;
conf->format = CAMQP_FORMAT_COMMAND;
@@
-940,7
+942,7
@@
static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */
conf->password = NULL;
conf->exchange = NULL;
conf->routing_key = NULL;
conf->password = NULL;
conf->exchange = NULL;
conf->routing_key = NULL;
- conf->connection_retry_delay =
6
0;
+ conf->connection_retry_delay = 0;
/* publish only */
conf->delivery_mode = CAMQP_DM_VOLATILE;
/* publish only */
conf->delivery_mode = CAMQP_DM_VOLATILE;