if (0 == strcasecmp ("tcp", protocol))
ai_hints.ai_socktype = SOCK_STREAM;
- else if (0 == strcasecmp ("udp", protocol))
- ai_hints.ai_socktype = SOCK_DGRAM;
else
- {
- ERROR ("write_graphite plugin: unknown protocol (%s)",
- protocol);
- return (-1);
- }
+ ai_hints.ai_socktype = SOCK_DGRAM;
ai_list = NULL;
"write_graphite plugin: Connecting to %s:%s via %s failed. "
"The last error was: %s", node, service, protocol,
sstrerror (errno, errbuf, sizeof (errbuf)));
- close (cb->sock_fd);
return (-1);
}
else
wg_flush_nolock (/* timeout = */ 0, cb);
- close(cb->sock_fd);
- cb->sock_fd = -1;
+ if (cb->sock_fd >= 0)
+ {
+ close (cb->sock_fd);
+ cb->sock_fd = -1;
+ }
sfree(cb->name);
sfree(cb->node);
return (status);
/* Send the message to graphite */
- wg_send_message (buffer, cb);
- if (status != 0)
- {
- /* An error message has already been printed. */
+ status = wg_send_message (buffer, cb);
+ if (status != 0) /* error message has been printed already. */
return (status);
- }
return (0);
} /* int wg_write_messages */
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)