From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 12 Oct 2007 16:33:59 +0000 (+0200)
Subject: Merge branch 'collectd-4.0' into collectd-4.1
X-Git-Tag: collectd-4.1.3~4
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=09c6d16ffba1b1b15e50579bbcf663f05f630932

Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

	src/rrdtool.c
---

09c6d16ffba1b1b15e50579bbcf663f05f630932
diff --cc src/network.c
index b0f8303f,164759b6..c81d7110
--- a/src/network.c
+++ b/src/network.c
@@@ -1100,20 -1092,8 +1099,18 @@@ static int add_to_buffer (char *buffer
  					(uint64_t) vl->time))
  			return (-1);
  		vl_def->time = vl->time;
- 		DEBUG ("network plugin: add_to_buffer: time = %u",
- 				(unsigned int) vl->time);
  	}
  
 +	if (vl_def->interval != vl->interval)
 +	{
 +		if (write_part_number (&buffer, &buffer_size, TYPE_INTERVAL,
 +					(uint64_t) vl->interval))
 +			return (-1);
 +		vl_def->interval = vl->interval;
 +		DEBUG ("network plugin: add_to_buffer: interval = %i",
 +				(int) vl->interval);
 +	}
 +
  	if (strcmp (vl_def->plugin, vl->plugin) != 0)
  	{
  		if (write_part_string (&buffer, &buffer_size, TYPE_PLUGIN,
diff --cc src/rrdtool.c
index 7002dcfb,8ad01069..77d87166
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@@ -714,7 -591,10 +714,7 @@@ static void rrd_cache_flush (int timeou
  	avl_iterator_t *iter;
  	int i;
  
- 	DEBUG ("Flushing cache, timeout = %i", timeout);
 -	if (cache == NULL)
 -		return;
 -
+ 	DEBUG ("rrdtool plugin: Flushing cache, timeout = %i", timeout);
  
  	now = time (NULL);