Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 74c5ccb..191892d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,37 @@
        * scale target: This target to scale (multiply) values by an arbitrary
          value has been added.
 
+2010-04-07, Version 4.8.4
+       * Build system, various plugins: Fixes for AIX compatibility have been
+         added. Thanks to Manuel Sanmartin for his patches.
+       * Build system: Checking for "nanosleep" on old Solaris machines has
+         been fixed. Thanks to Vincent McIntyre and Sebastian Harl for
+         figuring out a way to make this work.
+       * collectd: Serialization of NANs in JSON format has been fixed.
+         Thanks to Chris Buben for pointing out the resulting syntax error.
+       * collectd: Checks whether a "sleep" returned early have been added;
+         the cases are now handled correctly. Thanks to Michael Stapelberg
+         for the patch.
+       * collectd: Continue reading files in a directory when parsing one
+         file fails.
+       * apache plugin: Collection of the number of active connections has
+         been fixed for Apache 2.*.
+       * exec plugin: Error messages have been improved. The "running" flag
+         is now cleared correctly when forking a child fails.
+       * iptables plugin: Fix a violation of aliasing rules. This resolves a
+         warning / error with new GCC versions. Thanks to Jan Engelhardt for
+         the work-around.
+       * java plugin: The Java API files are now packaged into a .jar file.
+         Thanks to Amit Gupta for his patch.
+       * network plugin: A memory leak when receiving encrypted network
+         packets has been fixed.
+       * oracle plugin: Fix checking for lost connections and reconnect in
+         this case. Thanks to Sven Trenkel for pointing out the problem.
+       * unixsock plugin: A memory leak in the "LISTVAL" command has been
+         fixed. Thanks to Peter Warasin for pointing it out.
+       * write_http plugin: Use the "any" authentication schema. This used to
+         be "digest". Thanks to Paul Sadauskas for the patch.
+
 2010-01-14, Version 4.8.3
        * Documentation: Some manpage fixes.
        * rrdtool plugin: Fix a bug with random write timeouts. Due to an

diff --git a/contrib/exec-nagios.px b/contrib/exec-nagios.px
index a9f4663..938721f 100755 (executable)
--- a/contrib/exec-nagios.px
+++ b/contrib/exec-nagios.px
@@ -88,6 +88,8 @@ with the C<exec-plugin>).
 
 =back
 
+=back
+
 =cut
 
 sub handle_config_addtype
@@ -293,7 +295,7 @@ sub execute_script
       
       if ($perfdata)
       {
-       push (@serviceperfdata, split (' ', $perfdata));
+        push (@serviceperfdata, split (' ', $perfdata));
       }
 
       $state = 1;
@@ -308,8 +310,8 @@ sub execute_script
 
       if ($perfdata)
       {
-       push (@serviceperfdata, split (' ', $perfdata));
-       $state = 2;
+        push (@serviceperfdata, split (' ', $perfdata));
+        $state = 2;
       }
     }
     else # ($state == 2)
@@ -347,7 +349,7 @@ sub execute_script
     for (@serviceperfdata)
     {
       handle_performance_data ($host, 'nagios', $pinst, $script->{'type'},
-       $time, $_);
+        $time, $_);
     }
   }
 } # execute_script

diff --git a/src/network.c b/src/network.c
index a3ec5d9..5bbdd89 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -740,11 +740,11 @@ static int parse_part_values (void **ret_buffer, size_t *ret_buffer_len,
                    break;
 
                  default:
-                   sfree (pkg_types);
-                   sfree (pkg_values);
                    NOTICE ("network plugin: parse_part_values: "
                        "Don't know how to handle data source type %"PRIu8,
                        pkg_types[i]);
+                   sfree (pkg_types);
+                   sfree (pkg_values);
                    return (-1);
                } /* switch (pkg_types[i]) */
        }

diff --git a/src/plugin.c b/src/plugin.c
index 1eed532..5ff21c6 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -1480,14 +1480,6 @@ void plugin_log (int level, const char *format, ...)
        va_list ap;
        llentry_t *le;
 
-       if (list_log == NULL)
-       {
-               va_start (ap, format);
-               vfprintf (stderr, format, ap);
-               va_end (ap);
-               return;
-       }
-
 #if !COLLECT_DEBUG
        if (level >= LOG_DEBUG)
                return;
@@ -1498,6 +1490,12 @@ void plugin_log (int level, const char *format, ...)
        msg[sizeof (msg) - 1] = '\0';
        va_end (ap);
 
+       if (list_log == NULL)
+       {
+               fprintf (stderr, "%s\n", msg);
+               return;
+       }
+
        le = llist_head (list_log);
        while (le != NULL)
        {

diff --git a/version-gen.sh b/version-gen.sh
index bd87bbb..a84eddb 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEFAULT_VERSION="4.8.2.git"
+DEFAULT_VERSION="4.8.4.git"
 
 VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"