X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fwrite_graphite.c;h=f6c73ac80d8f616e698ec26893dbe489834b13e8;hb=96232c0ca167caadc7aeef6c8c54703ee8247888;hp=d3d520279bf95dd0f8edb24687ea0d490426a503;hpb=102e4f4ff7e99650b5624a7af1ba3885975a0b8c;p=collectd.git diff --git a/src/write_graphite.c b/src/write_graphite.c index d3d52027..f6c73ac8 100644 --- a/src/write_graphite.c +++ b/src/write_graphite.c @@ -57,34 +57,16 @@ #include #include -#ifndef WG_DEFAULT_NODE -# define WG_DEFAULT_NODE "localhost" -#endif - -#ifndef WG_DEFAULT_SERVICE -# define WG_DEFAULT_SERVICE "2003" -#endif - -#ifndef WG_DEFAULT_PROTOCOL -# define WG_DEFAULT_PROTOCOL "tcp" -#endif - -#ifndef WG_DEFAULT_LOG_SEND_ERRORS -# define WG_DEFAULT_LOG_SEND_ERRORS 1 -#endif - -#ifndef WG_DEFAULT_ESCAPE -# define WG_DEFAULT_ESCAPE '_' -#endif +#define WG_DEFAULT_NODE "localhost" +#define WG_DEFAULT_SERVICE "2003" +#define WG_DEFAULT_PROTOCOL "tcp" +#define WG_DEFAULT_LOG_SEND_ERRORS 1 +#define WG_DEFAULT_ESCAPE '_' /* Ethernet - (IPv6 + TCP) = 1500 - (40 + 32) = 1428 */ -#ifndef WG_SEND_BUF_SIZE -# define WG_SEND_BUF_SIZE 1428 -#endif +#define WG_SEND_BUF_SIZE 1428 -#ifndef WG_MIN_RECONNECT_INTERVAL -# define WG_MIN_RECONNECT_INTERVAL TIME_T_TO_CDTIME_T (1) -#endif +#define WG_MIN_RECONNECT_INTERVAL TIME_T_TO_CDTIME_T (1) /* * Private variables @@ -193,10 +175,10 @@ static int wg_callback_init (struct wg_callback *cb) cdtime_t now; int status; - 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; + char connerr[1024] = ""; + if (cb->sock_fd > 0) return (0); @@ -220,11 +202,11 @@ static int wg_callback_init (struct wg_callback *cb) ai_list = NULL; - status = getaddrinfo (node, service, &ai_hints, &ai_list); + status = getaddrinfo (cb->node, cb->service, &ai_hints, &ai_list); if (status != 0) { ERROR ("write_graphite plugin: getaddrinfo (%s, %s, %s) failed: %s", - node, service, protocol, gai_strerror (status)); + cb->node, cb->service, protocol, gai_strerror (status)); return (-1); } @@ -233,12 +215,19 @@ static int wg_callback_init (struct wg_callback *cb) { cb->sock_fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol); - if (cb->sock_fd < 0) + if (cb->sock_fd < 0) { + char errbuf[1024]; + snprintf (connerr, sizeof (connerr), "failed to open socket: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); continue; + } status = connect (cb->sock_fd, ai_ptr->ai_addr, ai_ptr->ai_addrlen); if (status != 0) { + char errbuf[1024]; + snprintf (connerr, sizeof (connerr), "failed to connect to remote " + "host: %s", sstrerror (errno, errbuf, sizeof (errbuf))); close (cb->sock_fd); cb->sock_fd = -1; continue; @@ -251,18 +240,19 @@ static int wg_callback_init (struct wg_callback *cb) if (cb->sock_fd < 0) { - char errbuf[1024]; + if (connerr[0] == '\0') + /* this should not happen but try to get a message anyway */ + sstrerror (errno, connerr, sizeof (connerr)); c_complain (LOG_ERR, &cb->init_complaint, - "write_graphite plugin: Connecting to %s:%s via %s failed. " - "The last error was: %s", node, service, protocol, - sstrerror (errno, errbuf, sizeof (errbuf))); + "write_graphite plugin: Connecting to %s:%s via %s failed. " + "The last error was: %s", cb->node, cb->service, protocol, connerr); return (-1); } else { c_release (LOG_INFO, &cb->init_complaint, "write_graphite plugin: Successfully connected to %s:%s via %s.", - node, service, protocol); + cb->node, cb->service, protocol); } wg_reset_buffer (cb); @@ -476,8 +466,8 @@ static int wg_config_node (oconfig_item_t *ci) memset (cb, 0, sizeof (*cb)); cb->sock_fd = -1; cb->name = NULL; - cb->node = NULL; - cb->service = NULL; + cb->node = strdup (WG_DEFAULT_NODE); + cb->service = strdup (WG_DEFAULT_SERVICE); cb->protocol = NULL; cb->log_send_errors = WG_DEFAULT_LOG_SEND_ERRORS; cb->prefix = NULL; @@ -556,8 +546,8 @@ static int wg_config_node (oconfig_item_t *ci) /* FIXME: Legacy configuration syntax. */ if (cb->name == NULL) 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->node, + cb->service, cb->protocol != NULL ? cb->protocol : WG_DEFAULT_PROTOCOL); else ssnprintf (callback_name, sizeof (callback_name), "write_graphite/%s",