X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Famqp.c;h=f0abd44b461a38c5c7fade0b1e96b92f11897ec7;hb=144b79a116c4d71e6172caad176db6f014c9b7fd;hp=d3a53d7ab2a1844057f1d940fe911357ac38e0ef;hpb=28144b13e832d39bc10143ef4f5097868688f299;p=collectd.git diff --git a/src/amqp.c b/src/amqp.c index d3a53d7a..f0abd44b 100644 --- a/src/amqp.c +++ b/src/amqp.c @@ -26,18 +26,14 @@ * Florian Forster **/ -#include -#include -#include -#include -#include - #include "collectd.h" #include "common.h" #include "plugin.h" #include "utils_cmd_putval.h" #include "utils_format_json.h" +#include + #include #include @@ -58,7 +54,6 @@ struct camqp_config_s { _Bool publish; char *name; - int format; char *host; int port; @@ -67,11 +62,12 @@ struct camqp_config_s char *password; char *exchange; - char *routingkey; + char *routing_key; /* publish only */ uint8_t delivery_mode; _Bool store_rates; + int format; /* subscribe only */ char *exchange_type; @@ -90,7 +86,6 @@ static const char *def_vhost = "/"; static const char *def_user = "guest"; static const char *def_password = "guest"; static const char *def_exchange = "amq.fanout"; -static const char *def_routingkey = "collectd"; static pthread_t *subscriber_threads = NULL; static size_t subscriber_threads_num = 0; @@ -133,7 +128,7 @@ static void camqp_config_free (void *ptr) /* {{{ */ sfree (conf->exchange); sfree (conf->exchange_type); sfree (conf->queue); - sfree (conf->routingkey); + sfree (conf->routing_key); sfree (conf); } /* }}} void camqp_config_free */ @@ -221,6 +216,37 @@ static char *camqp_strerror (camqp_config_t *conf, /* {{{ */ return (buffer); } /* }}} char *camqp_strerror */ +static int camqp_create_exchange (camqp_config_t *conf) /* {{{ */ +{ + amqp_exchange_declare_ok_t *ed_ret; + + if (conf->exchange_type == NULL) + return (0); + + ed_ret = amqp_exchange_declare (conf->connection, + /* channel = */ CAMQP_CHANNEL, + /* exchange = */ amqp_cstring_bytes (conf->exchange), + /* type = */ amqp_cstring_bytes (conf->exchange_type), + /* passive = */ 0, + /* durable = */ 0, + /* auto_delete = */ 1, + /* arguments = */ AMQP_EMPTY_TABLE); + if ((ed_ret == NULL) && camqp_is_error (conf)) + { + char errbuf[1024]; + ERROR ("amqp plugin: amqp_exchange_declare failed: %s", + camqp_strerror (conf, errbuf, sizeof (errbuf))); + camqp_close_connection (conf); + return (-1); + } + + INFO ("amqp plugin: Successfully created exchange \"%s\" " + "with type \"%s\".", + conf->exchange, conf->exchange_type); + + return (0); +} /* }}} int camqp_create_exchange */ + static int camqp_setup_queue (camqp_config_t *conf) /* {{{ */ { amqp_queue_declare_ok_t *qd_ret; @@ -262,42 +288,14 @@ static int camqp_setup_queue (camqp_config_t *conf) /* {{{ */ { amqp_queue_bind_ok_t *qb_ret; - /* create the exchange */ - if (conf->exchange_type != NULL) - { - amqp_exchange_declare_ok_t *ed_ret; - - ed_ret = amqp_exchange_declare (conf->connection, - /* channel = */ CAMQP_CHANNEL, - /* exchange = */ amqp_cstring_bytes (conf->exchange), - /* type = */ amqp_cstring_bytes (conf->exchange_type), - /* passive = */ 0, - /* durable = */ 0, - /* auto_delete = */ 1, - /* arguments = */ AMQP_EMPTY_TABLE); - if ((ed_ret == NULL) && camqp_is_error (conf)) - { - char errbuf[1024]; - ERROR ("amqp plugin: amqp_exchange_declare failed: %s", - camqp_strerror (conf, errbuf, sizeof (errbuf))); - camqp_close_connection (conf); - return (-1); - } - } - - DEBUG ("amqp plugin: queue = %s; exchange = %s; routing_key = %s;", - conf->queue, conf->exchange, CONF (conf, routingkey)); - assert (conf->queue != NULL); qb_ret = amqp_queue_bind (conf->connection, /* channel = */ CAMQP_CHANNEL, /* queue = */ amqp_cstring_bytes (conf->queue), /* exchange = */ amqp_cstring_bytes (conf->exchange), -#if 1 - /* routing_key = */ amqp_cstring_bytes (CONF (conf, routingkey)), -#else - /* routing_key = */ AMQP_EMPTY_BYTES, -#endif + /* routing_key = */ (conf->routing_key != NULL) + ? amqp_cstring_bytes (conf->routing_key) + : AMQP_EMPTY_BYTES, /* arguments = */ AMQP_EMPTY_TABLE); if ((qb_ret == NULL) && camqp_is_error (conf)) { @@ -392,12 +390,16 @@ static int camqp_connect (camqp_config_t *conf) /* {{{ */ INFO ("amqp plugin: Successfully opened connection to vhost \"%s\" " "on %s:%i.", CONF(conf, vhost), CONF(conf, host), conf->port); + status = camqp_create_exchange (conf); + if (status != 0) + return (status); + if (!conf->publish) return (camqp_setup_queue (conf)); return (0); } /* }}} int camqp_connect */ -static int shutdown (void) /* {{{ */ +static int camqp_shutdown (void) /* {{{ */ { size_t i; @@ -420,13 +422,13 @@ static int shutdown (void) /* {{{ */ DEBUG ("amqp plugin: All subscriber threads exited."); return (0); -} /* }}} int shutdown */ +} /* }}} int camqp_shutdown */ /* * Subscribing code */ static int camqp_read_body (camqp_config_t *conf, /* {{{ */ - size_t body_size) + size_t body_size, const char *content_type) { char body[body_size + 1]; char *body_ptr; @@ -470,7 +472,7 @@ static int camqp_read_body (camqp_config_t *conf, /* {{{ */ received += frame.payload.body_fragment.len; } /* while (received < body_size) */ - if (conf->format == CAMQP_FORMAT_COMMAND) + if (strcasecmp ("text/collectd", content_type) == 0) { status = handle_putval (stderr, body); if (status != 0) @@ -478,7 +480,7 @@ static int camqp_read_body (camqp_config_t *conf, /* {{{ */ status); return (status); } - else if (conf->format == CAMQP_FORMAT_JSON) + else if (strcasecmp ("application/json", content_type) == 0) { ERROR ("amqp plugin: camqp_read_body: Parsing JSON data has not " "been implemented yet. FIXME!"); @@ -486,8 +488,8 @@ static int camqp_read_body (camqp_config_t *conf, /* {{{ */ } else { - ERROR ("amqp plugin: camqp_read_body: Unknown format option (%i).", - conf->format); + ERROR ("amqp plugin: camqp_read_body: Unknown content type \"%s\".", + content_type); return (EINVAL); } @@ -499,6 +501,8 @@ static int camqp_read_header (camqp_config_t *conf) /* {{{ */ { int status; amqp_frame_t frame; + amqp_basic_properties_t *properties; + char *content_type; status = amqp_simple_wait_frame (conf->connection, &frame); if (status < 0) @@ -518,7 +522,20 @@ static int camqp_read_header (camqp_config_t *conf) /* {{{ */ return (-1); } - return (camqp_read_body (conf, frame.payload.properties.body_size)); + properties = frame.payload.properties.decoded; + content_type = camqp_bytes_cstring (&properties->content_type); + if (content_type == NULL) + { + ERROR ("amqp plugin: Unable to determine content type."); + return (-1); + } + + status = camqp_read_body (conf, + (size_t) frame.payload.properties.body_size, + content_type); + + sfree (content_type); + return (status); } /* }}} int camqp_read_header */ static void *camqp_subscribe_thread (void *user_data) /* {{{ */ @@ -608,8 +625,9 @@ static int camqp_subscribe_init (camqp_config_t *conf) /* {{{ */ /* * 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 *buffer, const char *routing_key) { amqp_basic_properties_t props; int status; @@ -622,14 +640,19 @@ static int camqp_write_locked (camqp_config_t *conf, /* {{{ */ props._flags = AMQP_BASIC_CONTENT_TYPE_FLAG | AMQP_BASIC_DELIVERY_MODE_FLAG | AMQP_BASIC_APP_ID_FLAG; - props.content_type = amqp_cstring_bytes("application/json"); + if (conf->format == CAMQP_FORMAT_COMMAND) + props.content_type = amqp_cstring_bytes("text/collectd"); + else if (conf->format == CAMQP_FORMAT_JSON) + props.content_type = amqp_cstring_bytes("application/json"); + else + assert (23 == 42); props.delivery_mode = conf->delivery_mode; props.app_id = amqp_cstring_bytes("collectd"); status = amqp_basic_publish(conf->connection, /* channel = */ 1, amqp_cstring_bytes(CONF(conf, exchange)), - amqp_cstring_bytes(CONF(conf, routingkey)), + amqp_cstring_bytes (routing_key), /* mandatory = */ 0, /* immediate = */ 0, &props, @@ -648,17 +671,37 @@ static int camqp_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */ user_data_t *user_data) { camqp_config_t *conf = user_data->data; + char routing_key[6 * DATA_MAX_NAME_LEN]; char buffer[4096]; - size_t bfree; - size_t bfill; int status; if ((ds == NULL) || (vl == NULL) || (conf == NULL)) return (EINVAL); memset (buffer, 0, sizeof (buffer)); - bfree = sizeof (buffer); - bfill = 0; + + if (conf->routing_key != NULL) + { + sstrncpy (routing_key, conf->routing_key, sizeof (routing_key)); + } + else + { + size_t i; + ssnprintf (routing_key, sizeof (routing_key), "collectd/%s/%s/%s/%s/%s", + vl->host, + vl->plugin, vl->plugin_instance, + vl->type, vl->type_instance); + + /* Switch slashes (the only character forbidden by collectd) and dots + * (the separation character used by AMQP). */ + for (i = 0; routing_key[i] != 0; i++) + { + if (routing_key[i] == '.') + routing_key[i] = '/'; + else if (routing_key[i] == '/') + routing_key[i] = '.'; + } + } if (conf->format == CAMQP_FORMAT_COMMAND) { @@ -672,6 +715,9 @@ static int camqp_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */ } else if (conf->format == CAMQP_FORMAT_JSON) { + size_t bfree = sizeof (buffer); + size_t bfill = 0; + format_json_initialize (buffer, &bfill, &bfree); format_json_value_list (buffer, &bfill, &bfree, ds, vl, conf->store_rates); format_json_finalize (buffer, &bfill, &bfree); @@ -683,7 +729,7 @@ static int camqp_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */ } pthread_mutex_lock (&conf->lock); - status = camqp_write_locked (conf, buffer); + status = camqp_write_locked (conf, buffer, routing_key); pthread_mutex_unlock (&conf->lock); return (status); @@ -744,7 +790,7 @@ static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */ conf->user = NULL; conf->password = NULL; conf->exchange = NULL; - conf->routingkey = NULL; + conf->routing_key = NULL; /* publish only */ conf->delivery_mode = CAMQP_DM_VOLATILE; conf->store_rates = 0; @@ -767,9 +813,7 @@ static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */ { oconfig_item_t *child = ci->children + i; - if (strcasecmp ("Format", child->key) == 0) - status = camqp_config_set_format (child, conf); - else if (strcasecmp ("Host", child->key) == 0) + if (strcasecmp ("Host", child->key) == 0) status = cf_util_get_string (child, &conf->host); else if (strcasecmp ("Port", child->key) == 0) { @@ -793,7 +837,7 @@ static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */ else if ((strcasecmp ("Queue", child->key) == 0) && !publish) status = cf_util_get_string (child, &conf->queue); else if (strcasecmp ("RoutingKey", child->key) == 0) - status = cf_util_get_string (child, &conf->routingkey); + status = cf_util_get_string (child, &conf->routing_key); else if ((strcasecmp ("Persistent", child->key) == 0) && publish) { _Bool tmp = 0; @@ -805,6 +849,8 @@ static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */ } else if ((strcasecmp ("StoreRates", child->key) == 0) && publish) status = cf_util_get_boolean (child, &conf->store_rates); + else if ((strcasecmp ("Format", child->key) == 0) && publish) + status = camqp_config_set_format (child, conf); else WARNING ("amqp plugin: Ignoring unknown " "configuration option \"%s\".", child->key); @@ -813,15 +859,16 @@ static int camqp_config_connection (oconfig_item_t *ci, /* {{{ */ break; } /* for (i = 0; i < ci->children_num; i++) */ - if ((status == 0) && !publish && (conf->exchange == NULL)) + if ((status == 0) && (conf->exchange == NULL)) { - if (conf->routingkey != 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 (!publish && (conf->routing_key != NULL)) + WARNING ("amqp plugin: The option \"RoutingKey\" was given " + "without the \"Exchange\" option. It will be ignored."); + } if (status != 0) @@ -886,7 +933,7 @@ static int camqp_config (oconfig_item_t *ci) /* {{{ */ 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 : */