From: J. Javier Maestro <jjmaestro@ieee.org>
Date: Sun, 16 Jun 2013 17:37:32 +0000 (+0200)
Subject: write_graphite plugin: avoid flooding the log with the protocol error check
X-Git-Tag: collectd-5.4.0~27^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=eab40ae770c969d6d6871f9a1356115d93e1f3d6;p=collectd.git

write_graphite plugin: avoid flooding the log with the protocol error check

Moving the protocol error checking from `wg_callback_init` to `wg_config_node`.
This avoids flooding the log, as suggested by Florian Forster (@octo).
---

diff --git a/src/write_graphite.c b/src/write_graphite.c
index c264932f..c1a11df2 100644
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -199,14 +199,8 @@ static int wg_callback_init (struct wg_callback *cb)
 
     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;
 
@@ -499,7 +493,17 @@ static int wg_config_node (oconfig_item_t *ci)
         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)