From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Thu, 19 Sep 2013 21:27:02 +0000 (+0200)
Subject: switch default write_graphite protocol back to TCP
X-Git-Tag: collectd-5.4.1~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6be256a584f4d19d105f6fa06e5634cedc21db64;p=collectd.git

switch default write_graphite protocol back to TCP

The *default* protocol was switched to UDP in 498a0dcd, when UDP support
was added to the plugin.

Switching this default back to TCP, because it makes the plugin break
for users upgrading to 5.4, and also because the UDP listener is disabled
in a default graphite installation (cf.
https://github.com/graphite-project/carbon/blob/0.9.x/conf/carbon.conf.example#L78)

Fixes GH#428
---

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index f93cda5c..6d19c322 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -1133,7 +1133,7 @@
 #  <Node "example">
 #    Host "localhost"
 #    Port "2003"
-#    Protocol "udp"
+#    Protocol "tcp"
 #    LogSendErrors true
 #    Prefix "collectd"
 #    Postfix "collectd"
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 2aebbd3a..4bd8aac3 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -6085,7 +6085,7 @@ Synopsis:
    <Node "example">
      Host "localhost"
      Port "2003"
-     Protocol "udp"
+     Protocol "tcp"
      LogSendErrors true
      Prefix "collectd"
    </Node>
@@ -6106,7 +6106,7 @@ Service name or port number to connect to. Defaults to C<2003>.
 
 =item B<Protocol> I<String>
 
-Protocol to use when connecting to I<Graphite>. Defaults to C<udp>.
+Protocol to use when connecting to I<Graphite>. Defaults to C<tcp>.
 
 =item B<LogSendErrors> B<false>|B<true>
 
diff --git a/src/write_graphite.c b/src/write_graphite.c
index 6124d33e..667c11e3 100644
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -67,7 +67,7 @@
 #endif
 
 #ifndef WG_DEFAULT_PROTOCOL
-# define WG_DEFAULT_PROTOCOL "udp"
+# define WG_DEFAULT_PROTOCOL "tcp"
 #endif
 
 #ifndef WG_DEFAULT_LOG_SEND_ERRORS