From: Florian Forster <octo@collectd.org>
Date: Sat, 13 Jul 2013 09:24:27 +0000 (+0200)
Subject: Merge branch 'collectd-5.3'
X-Git-Tag: collectd-5.4.0~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10b92353ea2ccf66eabad273799c36225d2efc3f;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.3'

Conflicts:
	src/plugin.c
---

10b92353ea2ccf66eabad273799c36225d2efc3f
diff --cc src/plugin.c
index 894b0e51d,d3767d128..2ad866e3b
--- a/src/plugin.c
+++ b/src/plugin.c
@@@ -1729,7 -1679,7 +1750,8 @@@ void plugin_shutdown_all (void
  	destroy_all_callbacks (&list_shutdown);
  	destroy_all_callbacks (&list_log);
  
 +	plugin_free_loaded ();
+ 	plugin_free_data_sets ();
  } /* void plugin_shutdown_all */
  
  int plugin_dispatch_missing (const value_list_t *vl) /* {{{ */
diff --cc src/write_graphite.c
index c1a11df2d,99c6f4d80..6124d33ed
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@@ -237,10 -219,9 +237,9 @@@ static int wg_callback_init (struct wg_
      {
          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)));
-         close (cb->sock_fd);
          return (-1);
      }
      else