Merge branch 'collectd-4.7'

diff --git a/configure.in b/configure.in
index c9d76299bb4be4d46a8eea65b25ba0150c3cd6f0..d9f79d935f103f7130e0140c7faf5cd3554c17f0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1501,7 +1501,7 @@ then
        if test -d "$with_java_home"
        then
                AC_MSG_CHECKING([for jni.h])
-               TMPDIR=`find -L "$with_java_home" -name jni.h -exec 'dirname' '{}' ';' | head -n 1`
+               TMPDIR=`find -L "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' | head -n 1`
                if test "x$TMPDIR" != "x"
                then
                        AC_MSG_RESULT([found in $TMPDIR])
@@ -1511,7 +1511,7 @@ then
                fi
 
                AC_MSG_CHECKING([for jni_md.h])
-               TMPDIR=`find -L "$with_java_home" -name jni_md.h -exec 'dirname' '{}' ';' | head -n 1`
+               TMPDIR=`find -L "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' | head -n 1`
                if test "x$TMPDIR" != "x"
                then
                        AC_MSG_RESULT([found in $TMPDIR])
@@ -1521,7 +1521,7 @@ then
                fi
 
                AC_MSG_CHECKING([for libjvm.so])
-               TMPDIR=`find -L "$with_java_home" -name libjvm.so -exec 'dirname' '{}' ';' | head -n 1`
+               TMPDIR=`find -L "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' | head -n 1`
                if test "x$TMPDIR" != "x"
                then
                        AC_MSG_RESULT([found in $TMPDIR])
@@ -1533,7 +1533,7 @@ then
                if test "x$JAVAC" = "x"
                then
                        AC_MSG_CHECKING([for javac])
-                       TMPDIR=`find -L "$with_java_home" -name javac | head -n 1`
+                       TMPDIR=`find -L "$with_java_home" -name javac -type f | head -n 1`
                        if test "x$TMPDIR" != "x"
                        then
                                JAVAC="$TMPDIR"
@@ -3835,6 +3835,11 @@ else
        enable_perl="no (needs libperl)"
 fi
 
+if test "x$enable_perl" = "xno" && test "x$c_cv_have_perl_ithreads" = "xno"
+then
+       enable_perl="no (libperl doesn't support ithreads)"
+fi
+
 if test "x$with_perl_bindings" = "xyes" \
        && test "x$PERL_BINDINGS_OPTIONS" != "x"
 then

diff --git a/src/Makefile.am b/src/Makefile.am
index 8b5fa5463f6ad69f5cd6e63520ec493900a091a7..6a985e2cb12594c4d750e4eef2e65e67b84d7d86 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1016,7 +1016,7 @@ dist_man_MANS = collectd.1 \
                collectd.conf.5 \
                collectd-email.5 \
                collectd-exec.5 \
-               collectd-java.5
+               collectd-java.5 \
                collectdmon.1 \
                collectd-nagios.1 \
                collectd-perl.5 \

diff --git a/src/plugin.c b/src/plugin.c
index b120e7ba6f5f0c9b5c612486001a46a07abfa9c9..6139baf0de05a2145ac5020d73d2bf64ef2814ae 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -1257,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);

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 98ec66621c93460197891d67b838b5ff8fad8803..780b2e5ab93452942b8895085ceb591f8bc655ec 100644 (file)
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -1025,8 +1025,13 @@ static int rrd_shutdown (void)
 
 static int rrd_init (void)
 {
+       static int init_once = 0;
        int status;
 
+       if (init_once != 0)
+               return (0);
+       init_once = 1;
+
        if (rrdcreate_config.stepsize < 0)
                rrdcreate_config.stepsize = 0;
        if (rrdcreate_config.heartbeat <= 0)