From: Florian Forster <octo@collectd.org>
Date: Sun, 3 Feb 2013 10:39:50 +0000 (+0100)
Subject: Merge branch 'collectd-5.2'
X-Git-Tag: collectd-5.3.0~42
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=99d7118d9ec6fd9b2907cef30bfa91c72b3a5826;p=collectd.git

Merge branch 'collectd-5.2'
---

99d7118d9ec6fd9b2907cef30bfa91c72b3a5826
diff --cc src/Makefile.am
index f31c176e,45fd9f93..98c62faf
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1426,11 -1415,8 +1426,11 @@@ EXTRA_DIST +=   collectd.conf.pod 
  	fi
  
  pinba.pb-c.c pinba.pb-c.h: pinba.proto
- 	protoc-c --c_out . pinba.proto
+ 	protoc-c -I$(srcdir) --c_out . $(srcdir)/pinba.proto
  
 +riemann.pb-c.c riemann.pb-c.h: riemann.proto
 +	protoc-c --c_out . riemann.proto
 +
  install-exec-hook:
  	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
  	if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
diff --cc src/write_graphite.c
index 1d504100,87befb63..949a8425
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@@ -438,20 -441,10 +445,21 @@@ static int wg_config_node (oconfig_item
      cb->prefix = NULL;
      cb->postfix = NULL;
      cb->escape_char = WG_DEFAULT_ESCAPE;
-     cb->store_rates = 1;
+     cb->format_flags = GRAPHITE_STORE_RATES;
  
 +    /* FIXME: Legacy configuration syntax. */
 +    if (strcasecmp ("Carbon", ci->key) != 0)
 +    {
 +        int status = cf_util_get_string (ci, &cb->name);
 +        if (status != 0)
 +        {
 +            wg_callback_free (cb);
 +            return (status);
 +        }
 +    }
 +
      pthread_mutex_init (&cb->send_lock, /* attr = */ NULL);
+     C_COMPLAIN_INIT (&cb->init_complaint);
  
      for (i = 0; i < ci->children_num; i++)
      {