projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
amqp plugin: Document the lock required to hold when calling "camqp_write_locked".
[collectd.git]
/
src
/
amqp.c
diff --git
a/src/amqp.c
b/src/amqp.c
index
d6cd275
..
f0abd44
100644
(file)
--- a/
src/amqp.c
+++ b/
src/amqp.c
@@
-26,18
+26,14
@@
* Florian Forster <octo at verplant.org>
**/
* Florian Forster <octo at verplant.org>
**/
-#include <stdint.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <strings.h>
-#include <pthread.h>
-
#include "collectd.h"
#include "common.h"
#include "plugin.h"
#include "utils_cmd_putval.h"
#include "utils_format_json.h"
#include "collectd.h"
#include "common.h"
#include "plugin.h"
#include "utils_cmd_putval.h"
#include "utils_format_json.h"
+#include <pthread.h>
+
#include <amqp.h>
#include <amqp_framing.h>
#include <amqp.h>
#include <amqp_framing.h>
@@
-403,7
+399,7
@@
static int camqp_connect (camqp_config_t *conf) /* {{{ */
return (0);
} /* }}} int camqp_connect */
return (0);
} /* }}} int camqp_connect */
-static int shutdown (void) /* {{{ */
+static int
camqp_
shutdown (void) /* {{{ */
{
size_t i;
{
size_t i;
@@
-426,7
+422,7
@@
static int shutdown (void) /* {{{ */
DEBUG ("amqp plugin: All subscriber threads exited.");
return (0);
DEBUG ("amqp plugin: All subscriber threads exited.");
return (0);
-} /* }}} int shutdown */
+} /* }}} int
camqp_
shutdown */
/*
* Subscribing code
/*
* Subscribing code
@@
-629,6
+625,7
@@
static int camqp_subscribe_init (camqp_config_t *conf) /* {{{ */
/*
* Publishing code
*/
/*
* Publishing code
*/
+/* XXX: You must hold "conf->lock" when calling this function! */
static int camqp_write_locked (camqp_config_t *conf, /* {{{ */
const char *buffer, const char *routing_key)
{
static int camqp_write_locked (camqp_config_t *conf, /* {{{ */
const char *buffer, const char *routing_key)
{
@@
-862,15
+859,16
@@
static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */
break;
} /* for (i = 0; i < ci->children_num; i++) */
break;
} /* for (i = 0; i < ci->children_num; i++) */
- if ((status == 0) &&
!publish &&
(conf->exchange == NULL))
+ if ((status == 0) && (conf->exchange == NULL))
{
{
- if (conf->routing_key != NULL)
- WARNING ("amqp plugin: The option \"RoutingKey\" was given "
- "without the \"Exchange\" option. It will be ignored.");
-
if (conf->exchange_type != NULL)
WARNING ("amqp plugin: The option \"ExchangeType\" was given "
"without the \"Exchange\" option. It will be ignored.");
if (conf->exchange_type != NULL)
WARNING ("amqp plugin: The option \"ExchangeType\" was given "
"without the \"Exchange\" option. It will be ignored.");
+
+ if (!publish && (conf->routing_key != NULL))
+ WARNING ("amqp plugin: The option \"RoutingKey\" was given "
+ "without the \"Exchange\" option. It will be ignored.");
+
}
if (status != 0)
}
if (status != 0)
@@
-935,7
+933,7
@@
static int camqp_config (oconfig_item_t *ci) /* {{{ */
void module_register (void)
{
plugin_register_complex_config ("amqp", camqp_config);
void module_register (void)
{
plugin_register_complex_config ("amqp", camqp_config);
- plugin_register_shutdown ("amqp", shutdown);
+ plugin_register_shutdown ("amqp",
camqp_
shutdown);
} /* void module_register */
/* vim: set sw=4 sts=4 et fdm=marker : */
} /* void module_register */
/* vim: set sw=4 sts=4 et fdm=marker : */