projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.3'
[collectd.git]
/
src
/
plugin.c
diff --git
a/src/plugin.c
b/src/plugin.c
index
cf03849
..
1aad97c
100644
(file)
--- a/
src/plugin.c
+++ b/
src/plugin.c
@@
-314,7
+314,7
@@
int plugin_load (const char *type)
{
DIR *dh;
const char *dir;
{
DIR *dh;
const char *dir;
- char filename[BUFSIZE];
+ char filename[BUFSIZE]
= ""
;
char typename[BUFSIZE];
int typename_len;
int ret;
char typename[BUFSIZE];
int typename_len;
int ret;
@@
-381,6
+381,9
@@
int plugin_load (const char *type)
closedir (dh);
closedir (dh);
+ if (filename[0] == '\0')
+ fprintf (stderr, "Could not find plugin %s.\n", type);
+
return (ret);
}
return (ret);
}
@@
-720,16
+723,29
@@
int plugin_dispatch_values (const char *name, value_list_t *vl)
data_set_t *ds;
llentry_t *le;
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);
return (-1);
+ }
+
+ if (data_sets == NULL)
+ {
+ ERROR ("plugin_dispatch_values: No data sets registered. "
+ "Could the types database be read? Check "
+ "your `TypesDB' setting!");
+ return (-1);
+ }
if (c_avl_get (data_sets, name, (void *) &ds) != 0)
{
if (c_avl_get (data_sets, name, (void *) &ds) != 0)
{
-
DEBUG ("No such dataset registere
d: %s", name);
+
INFO ("plugin_dispatch_values: Dataset not foun
d: %s", name);
return (-1);
}
return (-1);
}
- DEBUG ("plugin
: plugin
_dispatch_values: time = %u; interval = %i; "
+ DEBUG ("plugin_dispatch_values: time = %u; interval = %i; "
"host = %s; "
"plugin = %s; plugin_instance = %s; "
"type = %s; type_instance = %s;",
"host = %s; "
"plugin = %s; plugin_instance = %s; "
"type = %s; type_instance = %s;",
@@
-743,7
+759,8
@@
int plugin_dispatch_values (const char *name, value_list_t *vl)
#else
if (ds->ds_num != vl->values_len)
{
#else
if (ds->ds_num != vl->values_len)
{
- ERROR ("plugin: ds->type = %s: (ds->ds_num = %i) != "
+ ERROR ("plugin_dispatch_values: ds->type = %s: "
+ "(ds->ds_num = %i) != "
"(vl->values_len = %i)",
ds->type, ds->ds_num, vl->values_len);
return (-1);
"(vl->values_len = %i)",
ds->type, ds->ds_num, vl->values_len);
return (-1);