From: Florian Forster <octo@noris.net>
Date: Tue, 1 Apr 2008 13:05:45 +0000 (+0200)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.3.3~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4fb5d4b471e3f6a24d7cd36272e48e57bcb2c68f;p=collectd.git

Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

	configure.in
	src/plugin.c
---

4fb5d4b471e3f6a24d7cd36272e48e57bcb2c68f
diff --cc configure.in
index 952f5c5d,db344978..766b6d6b
--- a/configure.in
+++ b/configure.in
@@@ -1627,7 -1565,10 +1627,10 @@@ the
  fi
  if test "x$with_libupsclient" = "xyes"
  then
+ 	SAVE_CPPFLAGS="$CPPFLAGS"
+ 	CPPFLAGS="$CPPFLAGS $with_upsclient_cflags"
+ 
 -	AC_CHECK_TYPES([UPSCONN_t, UPSCONN], [], [], 
 +	AC_CHECK_TYPES([UPSCONN_t, UPSCONN], [], [],
  [#include <stdlib.h>
  #include <stdio.h>
  #include <upsclient.h>])
diff --cc src/plugin.c
index 0570f0ee,7d2bb57f..8b2803df
--- a/src/plugin.c
+++ b/src/plugin.c
@@@ -671,16 -643,32 +674,29 @@@ int plugin_dispatch_values (const char 
  	data_set_t *ds;
  	llentry_t *le;
  
- 	if ((list_write == NULL) || (data_sets == NULL))
+ 	if (list_write == NULL)
+ 	{
+ 		ERROR ("plugin_dispatch_values: No write callback has been "
+ 				"registered. Please load at least one plugin "
+ 				"that provides a write function.");
+ 		return (-1);
+ 	}
+ 
 -	if (list_data_set == NULL)
++	if (data_sets == NULL)
+ 	{
+ 		ERROR ("plugin_dispatch_values: No data sets registered. "
+ 				"Could the types database be read? Check "
+ 				"your `TypesDB' setting!");
  		return (-1);
+ 	}
  
 -	le = llist_search (list_data_set, name);
 -	if (le == NULL)
 +	if (c_avl_get (data_sets, name, (void *) &ds) != 0)
  	{
- 		DEBUG ("No such dataset registered: %s", name);
+ 		INFO ("plugin_dispatch_values: Dataset not found: %s", name);
  		return (-1);
  	}
  
- 	DEBUG ("plugin: plugin_dispatch_values: time = %u; interval = %i; "
 -	ds = (data_set_t *) le->value;
 -
+ 	DEBUG ("plugin_dispatch_values: time = %u; interval = %i; "
  			"host = %s; "
  			"plugin = %s; plugin_instance = %s; "
  			"type = %s; type_instance = %s;",