projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto-Merge pull request #2826 from rpv-tomsk/collectd-master
[collectd.git]
/
src
/
amqp.c
diff --git
a/src/amqp.c
b/src/amqp.c
index
6d65bf8
..
281130b
100644
(file)
--- a/
src/amqp.c
+++ b/
src/amqp.c
@@
-111,8
+111,8
@@
static const char *def_user = "guest";
static const char *def_password = "guest";
static const char *def_exchange = "amq.fanout";
static const char *def_password = "guest";
static const char *def_exchange = "amq.fanout";
-static pthread_t *subscriber_threads
= NULL
;
-static size_t subscriber_threads_num
= 0
;
+static pthread_t *subscriber_threads;
+static size_t subscriber_threads_num;
static bool subscriber_threads_running = true;
#define CONF(c, f) (((c)->f != NULL) ? (c)->f : def_##f)
static bool subscriber_threads_running = true;
#define CONF(c, f) (((c)->f != NULL) ? (c)->f : def_##f)
@@
-182,9
+182,9
@@
static bool camqp_is_error(camqp_config_t *conf) /* {{{ */
r = amqp_get_rpc_reply(conf->connection);
if (r.reply_type == AMQP_RESPONSE_NORMAL)
r = amqp_get_rpc_reply(conf->connection);
if (r.reply_type == AMQP_RESPONSE_NORMAL)
- return
0
;
+ return
false
;
- return
1
;
+ return
true
;
} /* }}} bool camqp_is_error */
static char *camqp_strerror(camqp_config_t *conf, /* {{{ */
} /* }}} bool camqp_is_error */
static char *camqp_strerror(camqp_config_t *conf, /* {{{ */
@@
-396,7
+396,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_connect_time
= 0
;
+ static time_t last_connect_time;
amqp_rpc_reply_t reply;
int status;
amqp_rpc_reply_t reply;
int status;
@@
-850,7
+850,7
@@
static int camqp_config_connection(oconfig_item_t *ci, /* {{{ */
/* publish only */
conf->delivery_mode = CAMQP_DM_VOLATILE;
/* publish only */
conf->delivery_mode = CAMQP_DM_VOLATILE;
- conf->store_rates =
0
;
+ conf->store_rates =
false
;
conf->graphite_flags = 0;
/* publish & graphite only */
conf->prefix = NULL;
conf->graphite_flags = 0;
/* publish & graphite only */
conf->prefix = NULL;
@@
-859,8
+859,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
;
+ conf->queue_durable =
false
;
+ conf->queue_auto_delete =
true
;
/* general */
conf->connection = NULL;
pthread_mutex_init(&conf->lock, /* attr = */ NULL);
/* general */
conf->connection = NULL;
pthread_mutex_init(&conf->lock, /* attr = */ NULL);
@@
-998,9
+998,9
@@
static int camqp_config(oconfig_item_t *ci) /* {{{ */
oconfig_item_t *child = ci->children + i;
if (strcasecmp("Publish", child->key) == 0)
oconfig_item_t *child = ci->children + i;
if (strcasecmp("Publish", child->key) == 0)
- camqp_config_connection(child, /* publish = */
1
);
+ camqp_config_connection(child, /* publish = */
true
);
else if (strcasecmp("Subscribe", child->key) == 0)
else if (strcasecmp("Subscribe", child->key) == 0)
- camqp_config_connection(child, /* publish = */
0
);
+ camqp_config_connection(child, /* publish = */
false
);
else
WARNING("amqp plugin: Ignoring unknown config option \"%s\".",
child->key);
else
WARNING("amqp plugin: Ignoring unknown config option \"%s\".",
child->key);