Merge branch 'collectd-4.5'

[collectd.git] / src / configfile.c

diff --git a/src/configfile.c b/src/configfile.c
index bb57ca2..f9ade29 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -30,6 +30,7 @@
 #include "configfile.h"
 #include "types_list.h"
 #include "utils_threshold.h"
+#include "filter_chain.h"
 
 #if HAVE_WORDEXP_H
 # include <wordexp.h>
@@ -341,6 +342,8 @@ static int dispatch_block (oconfig_item_t *ci)
                return (dispatch_block_plugin (ci));
        else if (strcasecmp (ci->key, "Threshold") == 0)
                return (ut_config (ci));
+       else if (strcasecmp (ci->key, "Chain") == 0)
+               return (fc_configure (ci));
 
        return (0);
 }
@@ -892,7 +895,7 @@ int cf_read (char *filename)
 
        /* Read the default types.db if no `TypesDB' option was given. */
        if (cf_default_typesdb)
-               read_types_list (PLUGINDIR"/types.db");
+               read_types_list (PKGDATADIR"/types.db");
 
        return (0);
 } /* int cf_read */