Merge branch 'collectd-5.3'

Conflicts:
	src/plugin.c

diff --cc src/plugin.c
index 894b0e51d72731ba1f7faab5c032a122063e85be,d3767d1283b9678bec65e8665d5feb7b8c64bef7..2ad866e3bb2fbcb44012ff997b62932563bdd349
--- 1/src/plugin.c
--- 2/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 c1a11df2d0911175b3b512fa21829c7d2139b68f,99c6f4d80a91a669ee0ac86f0bfe0620de6bb13f..6124d33edf5a07ae26f922b1cc7a151a959b6c28
--- 1/src/write_graphite.c
--- 2/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