X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=blobdiff_plain;f=src%2Fwrite_graphite.c;h=6124d33edf5a07ae26f922b1cc7a151a959b6c28;hp=99c6f4d80a91a669ee0ac86f0bfe0620de6bb13f;hb=10b92353ea2ccf66eabad273799c36225d2efc3f;hpb=a320c4a23fee0e900a7cd2310c771b8dbd2a2d82 diff --git a/src/write_graphite.c b/src/write_graphite.c index 99c6f4d8..6124d33e 100644 --- a/src/write_graphite.c +++ b/src/write_graphite.c @@ -35,6 +35,8 @@ * * Host "localhost" * Port "2003" + * Protocol "udp" + * LogSendErrors true * Prefix "collectd" * * @@ -64,6 +66,14 @@ # define WG_DEFAULT_SERVICE "2003" #endif +#ifndef WG_DEFAULT_PROTOCOL +# define WG_DEFAULT_PROTOCOL "udp" +#endif + +#ifndef WG_DEFAULT_LOG_SEND_ERRORS +# define WG_DEFAULT_LOG_SEND_ERRORS 1 +#endif + #ifndef WG_DEFAULT_ESCAPE # define WG_DEFAULT_ESCAPE '_' #endif @@ -84,6 +94,8 @@ struct wg_callback char *node; char *service; + char *protocol; + _Bool log_send_errors; char *prefix; char *postfix; char escape_char; @@ -116,10 +128,11 @@ static int wg_send_buffer (struct wg_callback *cb) ssize_t status = 0; status = swrite (cb->sock_fd, cb->send_buf, strlen (cb->send_buf)); - if (status < 0) + if (cb->log_send_errors && status < 0) { char errbuf[1024]; - ERROR ("write_graphite plugin: send failed with status %zi (%s)", + ERROR ("write_graphite plugin: send to %s:%s (%s) failed with status %zi (%s)", + cb->node, cb->service, cb->protocol, status, sstrerror (errno, errbuf, sizeof (errbuf))); @@ -173,6 +186,7 @@ static int wg_callback_init (struct wg_callback *cb) const char *node = cb->node ? cb->node : WG_DEFAULT_NODE; const char *service = cb->service ? cb->service : WG_DEFAULT_SERVICE; + const char *protocol = cb->protocol ? cb->protocol : WG_DEFAULT_PROTOCOL; if (cb->sock_fd > 0) return (0); @@ -182,15 +196,19 @@ static int wg_callback_init (struct wg_callback *cb) ai_hints.ai_flags |= AI_ADDRCONFIG; #endif ai_hints.ai_family = AF_UNSPEC; - ai_hints.ai_socktype = SOCK_STREAM; + + if (0 == strcasecmp ("tcp", protocol)) + ai_hints.ai_socktype = SOCK_STREAM; + else + ai_hints.ai_socktype = SOCK_DGRAM; ai_list = NULL; status = getaddrinfo (node, service, &ai_hints, &ai_list); if (status != 0) { - ERROR ("write_graphite plugin: getaddrinfo (%s, %s) failed: %s", - node, service, gai_strerror (status)); + ERROR ("write_graphite plugin: getaddrinfo (%s, %s, %s) failed: %s", + node, service, protocol, gai_strerror (status)); return (-1); } @@ -219,16 +237,16 @@ static int wg_callback_init (struct wg_callback *cb) { char errbuf[1024]; c_complain (LOG_ERR, &cb->init_complaint, - "write_graphite plugin: Connecting to %s:%s failed. " - "The last error was: %s", node, service, + "write_graphite plugin: Connecting to %s:%s via %s failed. " + "The last error was: %s", node, service, protocol, sstrerror (errno, errbuf, sizeof (errbuf))); return (-1); } else { c_release (LOG_INFO, &cb->init_complaint, - "write_graphite plugin: Successfully connected to %s:%s.", - node, service); + "write_graphite plugin: Successfully connected to %s:%s via %s.", + node, service, protocol); } wg_reset_buffer (cb); @@ -257,6 +275,7 @@ static void wg_callback_free (void *data) sfree(cb->name); sfree(cb->node); + sfree(cb->protocol); sfree(cb->service); sfree(cb->prefix); sfree(cb->postfix); @@ -337,9 +356,10 @@ static int wg_send_message (char const *message, struct wg_callback *cb) cb->send_buf_fill += message_len; cb->send_buf_free -= message_len; - DEBUG ("write_graphite plugin: [%s]:%s buf %zu/%zu (%.1f %%) \"%s\"", + DEBUG ("write_graphite plugin: [%s]:%s (%s) buf %zu/%zu (%.1f %%) \"%s\"", cb->node, cb->service, + cb->protocol, cb->send_buf_fill, sizeof (cb->send_buf), 100.0 * ((double) cb->send_buf_fill) / ((double) sizeof (cb->send_buf)), message); @@ -429,6 +449,7 @@ static int wg_config_node (oconfig_item_t *ci) user_data_t user_data; char callback_name[DATA_MAX_NAME_LEN]; int i; + int status = 0; cb = malloc (sizeof (*cb)); if (cb == NULL) @@ -441,6 +462,8 @@ static int wg_config_node (oconfig_item_t *ci) cb->name = NULL; cb->node = NULL; cb->service = NULL; + cb->protocol = NULL; + cb->log_send_errors = WG_DEFAULT_LOG_SEND_ERRORS; cb->prefix = NULL; cb->postfix = NULL; cb->escape_char = WG_DEFAULT_ESCAPE; @@ -449,7 +472,7 @@ static int wg_config_node (oconfig_item_t *ci) /* FIXME: Legacy configuration syntax. */ if (strcasecmp ("Carbon", ci->key) != 0) { - int status = cf_util_get_string (ci, &cb->name); + status = cf_util_get_string (ci, &cb->name); if (status != 0) { wg_callback_free (cb); @@ -468,6 +491,20 @@ static int wg_config_node (oconfig_item_t *ci) cf_util_get_string (child, &cb->node); else if (strcasecmp ("Port", child->key) == 0) cf_util_get_service (child, &cb->service); + else if (strcasecmp ("Protocol", child->key) == 0) + { + cf_util_get_string (child, &cb->protocol); + + if (strcasecmp ("UDP", cb->protocol) != 0 && + strcasecmp ("TCP", cb->protocol) != 0) + { + ERROR ("write_graphite plugin: Unknown protocol (%s)", + cb->protocol); + status = -1; + } + } + else if (strcasecmp ("LogSendErrors", child->key) == 0) + cf_util_get_boolean (child, &cb->log_send_errors); else if (strcasecmp ("Prefix", child->key) == 0) cf_util_get_string (child, &cb->prefix); else if (strcasecmp ("Postfix", child->key) == 0) @@ -487,14 +524,25 @@ static int wg_config_node (oconfig_item_t *ci) { ERROR ("write_graphite plugin: Invalid configuration " "option: %s.", child->key); + status = -1; } + + if (status != 0) + break; + } + + if (status != 0) + { + wg_callback_free (cb); + return (status); } /* FIXME: Legacy configuration syntax. */ if (cb->name == NULL) - ssnprintf (callback_name, sizeof (callback_name), "write_graphite/%s/%s", + ssnprintf (callback_name, sizeof (callback_name), "write_graphite/%s/%s/%s", cb->node != NULL ? cb->node : WG_DEFAULT_NODE, - cb->service != NULL ? cb->service : WG_DEFAULT_SERVICE); + cb->service != NULL ? cb->service : WG_DEFAULT_SERVICE, + cb->protocol != NULL ? cb->protocol : WG_DEFAULT_PROTOCOL); else ssnprintf (callback_name, sizeof (callback_name), "write_graphite/%s", cb->name);