projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #660 from mfournier/logfile-log_level
[collectd.git]
/
src
/
amqp.c
diff --git
a/src/amqp.c
b/src/amqp.c
index
edd4f74
..
bdc62b3
100644
(file)
--- a/
src/amqp.c
+++ b/
src/amqp.c
@@
-79,6
+79,8
@@
struct camqp_config_s
/* subscribe only */
char *exchange_type;
char *queue;
/* subscribe only */
char *exchange_type;
char *queue;
+ _Bool queue_durable;
+ _Bool queue_auto_delete;
amqp_connection_state_t connection;
pthread_mutex_t lock;
amqp_connection_state_t connection;
pthread_mutex_t lock;
@@
-314,9
+316,9
@@
static int camqp_setup_queue (camqp_config_t *conf) /* {{{ */
? amqp_cstring_bytes (conf->queue)
: AMQP_EMPTY_BYTES,
/* passive = */ 0,
? amqp_cstring_bytes (conf->queue)
: AMQP_EMPTY_BYTES,
/* passive = */ 0,
- /* durable = */
0
,
+ /* durable = */
conf->queue_durable
,
/* exclusive = */ 0,
/* exclusive = */ 0,
- /* auto_delete = */
1
,
+ /* auto_delete = */
conf->queue_auto_delete
,
/* arguments = */ AMQP_EMPTY_TABLE);
if (qd_ret == NULL)
{
/* arguments = */ AMQP_EMPTY_TABLE);
if (qd_ret == NULL)
{
@@
-741,7
+743,7
@@
static int camqp_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */
{
camqp_config_t *conf = user_data->data;
char routing_key[6 * DATA_MAX_NAME_LEN];
{
camqp_config_t *conf = user_data->data;
char routing_key[6 * DATA_MAX_NAME_LEN];
- char buffer[
4096
];
+ char buffer[
8192
];
int status;
if ((ds == NULL) || (vl == NULL) || (conf == NULL))
int status;
if ((ds == NULL) || (vl == NULL) || (conf == NULL))
@@
-885,6
+887,8
@@
static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */
/* subscribe only */
conf->exchange_type = NULL;
conf->queue = NULL;
/* subscribe only */
conf->exchange_type = NULL;
conf->queue = NULL;
+ conf->queue_durable = 0;
+ conf->queue_auto_delete = 1;
/* general */
conf->connection = NULL;
pthread_mutex_init (&conf->lock, /* attr = */ NULL);
/* general */
conf->connection = NULL;
pthread_mutex_init (&conf->lock, /* attr = */ NULL);
@@
-924,6
+928,10
@@
static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */
status = cf_util_get_string (child, &conf->exchange_type);
else if ((strcasecmp ("Queue", child->key) == 0) && !publish)
status = cf_util_get_string (child, &conf->queue);
status = cf_util_get_string (child, &conf->exchange_type);
else if ((strcasecmp ("Queue", child->key) == 0) && !publish)
status = cf_util_get_string (child, &conf->queue);
+ else if (strcasecmp ("QueueDurable", child->key) == 0)
+ status = cf_util_get_boolean (child, &conf->queue_durable);
+ else if (strcasecmp ("QueueAutoDelete", child->key) == 0)
+ status = cf_util_get_boolean (child, &conf->queue_auto_delete);
else if (strcasecmp ("RoutingKey", child->key) == 0)
status = cf_util_get_string (child, &conf->routing_key);
else if ((strcasecmp ("Persistent", child->key) == 0) && publish)
else if (strcasecmp ("RoutingKey", child->key) == 0)
status = cf_util_get_string (child, &conf->routing_key);
else if ((strcasecmp ("Persistent", child->key) == 0) && publish)