Merge branch 'collectd-4.6' into collectd-4.7

[collectd.git] / src / plugin.c

diff --git a/src/plugin.c b/src/plugin.c
index 5a7a52a..6139baf 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -573,6 +573,7 @@ int plugin_load (const char *type)
                else if (!S_ISREG (statbuf.st_mode))
                {
                        /* don't follow symlinks */
+                       WARNING ("stat %s: not a regular file", filename);
                        continue;
                }
 
@@ -650,7 +651,7 @@ int plugin_register_read (const char *name,
                read_heap = c_heap_create (plugin_compare_read_func);
                if (read_heap == NULL)
                {
-                       ERROR ("plugin_register_complex_read: "
+                       ERROR ("plugin_register_read: "
                                        "c_heap_create failed.");
                        return (-1);
                }
@@ -690,8 +691,7 @@ int plugin_register_complex_read (const char *name,
                read_heap = c_heap_create (plugin_compare_read_func);
                if (read_heap == NULL)
                {
-                       ERROR ("plugin_register_complex_read: "
-                                       "c_heap_create failed.");
+                       ERROR ("plugin_register_read: c_heap_create failed.");
                        return (-1);
                }
        }
@@ -1166,6 +1166,9 @@ int plugin_dispatch_values (value_list_t *vl)
        if (vl->time == 0)
                vl->time = time (NULL);
 
+       if (vl->interval <= 0)
+               vl->interval = interval_g;
+
        DEBUG ("plugin_dispatch_values: time = %u; interval = %i; "
                        "host = %s; "
                        "plugin = %s; plugin_instance = %s; "
@@ -1254,6 +1257,9 @@ int plugin_dispatch_values (value_list_t *vl)
        /* Update the value cache */
        uc_update (ds, vl);
 
+       /* Initiate threshold checking */
+       ut_check_threshold (ds, vl);
+
        if (post_cache_chain != NULL)
        {
                status = fc_process_chain (ds, vl, post_cache_chain);