From: Marc Fournier Date: Wed, 7 Jan 2015 23:17:37 +0000 (+0100) Subject: Merge branch 'collectd-5.3' into collectd-5.4 X-Git-Tag: collectd-5.4.2~3 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=ecbcaadde7dff838f09dfb04c7eb90f126e35abf;hp=6c72fa02608cc4be8febc4ae3fec809d281536f8;p=collectd.git Merge branch 'collectd-5.3' into collectd-5.4 --- diff --git a/configure.ac b/configure.ac index d38cbb5d..a911e0fe 100644 --- a/configure.ac +++ b/configure.ac @@ -1926,7 +1926,7 @@ then [with_libgcrypt="no (symbol gcry_md_hash_buffer not found)"]) if test "$with_libgcrypt" != "no"; then - AM_PATH_LIBGCRYPT(1:1.2.0,,with_libgcrypt="no (version 1.2.0+ required)") + m4_ifdef([AM_PATH_LIBGCRYPT],[AM_PATH_LIBGCRYPT(1:1.2.0,,with_libgcrypt="no (version 1.2.0+ required)")]) GCRYPT_CPPFLAGS="$LIBGCRYPT_CPPFLAGS $LIBGCRYPT_CFLAGS" GCRYPT_LIBS="$LIBGCRYPT_LIBS" fi diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 0f9e0339..d6069b2c 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -200,7 +200,7 @@ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 License: GPLv2 Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: libgcrypt-devel, kernel-headers +BuildRequires: libgcrypt-devel, kernel-headers, libtool-ltdl-devel Vendor: collectd development team Requires(post): chkconfig @@ -1546,6 +1546,8 @@ find %{buildroot} -type f -name .packlist -delete find %{buildroot} -type f -name perllocal.pod -delete %if ! %{with_java} +rm -f %{buildroot}%{_datadir}/collectd/java/collectd-api.jar +rm -f %{buildroot}%{_datadir}/collectd/java/generic-jmx.jar rm -f %{buildroot}%{_mandir}/man5/collectd-java.5* %endif @@ -1556,6 +1558,10 @@ rm -fr perl-examples/ rm -fr %{buildroot}/usr/lib/perl5/ %endif +%if ! %{with_postgresql} +rm -f %{buildroot}%{_datadir}/collectd/postgresql_default.conf +%endif + %if ! %{with_python} rm -f %{buildroot}%{_mandir}/man5/collectd-python.5* %endif @@ -1595,7 +1601,7 @@ fi %{_bindir}/collectd-tg %{_bindir}/collectdctl %{_sbindir}/collectdmon -%{_datadir}/collectd/ +%{_datadir}/collectd/types.db %{_sharedstatedir}/collectd %{_mandir}/man1/collectd-nagios.1* %{_mandir}/man1/collectd.1* @@ -1879,8 +1885,8 @@ fi %if %{with_java} %files java -%{_prefix}/share/collectd/java/collectd-api.jar -%{_prefix}/share/collectd/java/generic-jmx.jar +%{_datadir}/collectd/java/collectd-api.jar +%{_datadir}/collectd/java/generic-jmx.jar %{_libdir}/%{name}/java.so %{_mandir}/man5/collectd-java.5* %endif @@ -1962,7 +1968,7 @@ fi %if %{with_postgresql} %files postgresql -%{_prefix}/share/collectd/postgresql_default.conf +%{_datadir}/collectd/postgresql_default.conf %{_libdir}/%{name}/postgresql.so %endif diff --git a/src/collectd.conf.in b/src/collectd.conf.in index 1e0f78c1..5088eaea 100644 --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@ -677,7 +677,7 @@ # Password "secret" # Interface "eth0" @LOAD_PLUGIN_NETWORK@ -# TimeToLive "128" +# TimeToLive 128 # # # server setup: # Listen "ff18::efc0:4a42" "25826" diff --git a/src/cpu.c b/src/cpu.c index 1c4e5f6b..6753397c 100644 --- a/src/cpu.c +++ b/src/cpu.c @@ -156,8 +156,6 @@ static int init (void) DEBUG ("host_processors returned %i %s", (int) cpu_list_len, cpu_list_len == 1 ? "processor" : "processors"); INFO ("cpu plugin: Found %i processor%s.", (int) cpu_list_len, cpu_list_len == 1 ? "" : "s"); - - cpu_temp_retry_max = 86400 / CDTIME_T_TO_TIME_T (plugin_get_interval ()); /* #endif PROCESSOR_CPU_LOAD_INFO */ #elif defined(HAVE_LIBKSTAT) diff --git a/src/libcollectdclient/client.c b/src/libcollectdclient/client.c index 726f25d4..49a4d879 100644 --- a/src/libcollectdclient/client.c +++ b/src/libcollectdclient/client.c @@ -258,6 +258,7 @@ static int lcc_send (lcc_connection_t *c, const char *command) /* {{{ */ lcc_set_errno (c, errno); return (-1); } + fflush(c->fh); return (0); } /* }}} int lcc_send */ diff --git a/src/libvirt.c b/src/libvirt.c index cfabaaa2..87b71e69 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -441,6 +441,12 @@ lv_read (void) continue; } + if (info.state != VIR_DOMAIN_RUNNING) + { + /* only gather stats for running domains */ + continue; + } + cpu_submit (info.cpuTime, domains[i], "virt_cpu_total"); memory_submit ((gauge_t) info.memory * 1024, domains[i]); diff --git a/src/pyvalues.c b/src/pyvalues.c index 4f5c4ce3..78e6cf9d 100644 --- a/src/pyvalues.c +++ b/src/pyvalues.c @@ -427,10 +427,11 @@ static meta_data_t *cpy_build_meta(PyObject *meta) { cpy_log_exception("building meta data"); return NULL; } - s = PyList_Size(l); - if (s < 0) + if (s <= 0) { + Py_XDECREF(l); return NULL; + } m = meta_data_create(); for (i = 0; i < s; ++i) { diff --git a/src/types_list.c b/src/types_list.c index 10cb4f28..887b43d8 100644 --- a/src/types_list.c +++ b/src/types_list.c @@ -159,7 +159,7 @@ static void parse_file (FILE *fh) continue; while ((buf_len > 0) && ((buf[buf_len - 1] == '\n') - || (buf[buf_len - 1] == '\n'))) + || (buf[buf_len - 1] == '\r'))) buf[--buf_len] = '\0'; if (buf_len == 0) diff --git a/src/utils_cmd_flush.c b/src/utils_cmd_flush.c index 3584f3b7..4e7526be 100644 --- a/src/utils_cmd_flush.c +++ b/src/utils_cmd_flush.c @@ -27,12 +27,15 @@ #include "utils_parse_option.h" #define print_to_socket(fh, ...) \ - if (fprintf (fh, __VA_ARGS__) < 0) { \ - char errbuf[1024]; \ - WARNING ("handle_flush: failed to write to socket #%i: %s", \ - fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ - return -1; \ - } + do { \ + if (fprintf (fh, __VA_ARGS__) < 0) { \ + char errbuf[1024]; \ + WARNING ("handle_flush: failed to write to socket #%i: %s", \ + fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ + return -1; \ + } \ + fflush(fh); \ + } while (0) static int add_to_array (char ***array, int *array_num, char *value) { diff --git a/src/utils_cmd_getval.c b/src/utils_cmd_getval.c index ce3e28e0..657483b6 100644 --- a/src/utils_cmd_getval.c +++ b/src/utils_cmd_getval.c @@ -27,12 +27,15 @@ #include "utils_parse_option.h" #define print_to_socket(fh, ...) \ - if (fprintf (fh, __VA_ARGS__) < 0) { \ - char errbuf[1024]; \ - WARNING ("handle_getval: failed to write to socket #%i: %s", \ - fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ - return -1; \ - } + do { \ + if (fprintf (fh, __VA_ARGS__) < 0) { \ + char errbuf[1024]; \ + WARNING ("handle_getval: failed to write to socket #%i: %s", \ + fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ + return -1; \ + } \ + fflush(fh); \ + } while (0) int handle_getval (FILE *fh, char *buffer) { diff --git a/src/utils_cmd_listval.c b/src/utils_cmd_listval.c index ef66af56..fb45200a 100644 --- a/src/utils_cmd_listval.c +++ b/src/utils_cmd_listval.c @@ -39,12 +39,15 @@ } while (0) #define print_to_socket(fh, ...) \ - if (fprintf (fh, __VA_ARGS__) < 0) { \ - char errbuf[1024]; \ - WARNING ("handle_listval: failed to write to socket #%i: %s", \ - fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ - free_everything_and_return (-1); \ - } + do { \ + if (fprintf (fh, __VA_ARGS__) < 0) { \ + char errbuf[1024]; \ + WARNING ("handle_listval: failed to write to socket #%i: %s", \ + fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ + free_everything_and_return (-1); \ + } \ + fflush(fh); \ + } while (0) int handle_listval (FILE *fh, char *buffer) { diff --git a/src/utils_cmd_putnotif.c b/src/utils_cmd_putnotif.c index d3cf3834..bed84628 100644 --- a/src/utils_cmd_putnotif.c +++ b/src/utils_cmd_putnotif.c @@ -26,12 +26,15 @@ #include "utils_parse_option.h" #define print_to_socket(fh, ...) \ - if (fprintf (fh, __VA_ARGS__) < 0) { \ - char errbuf[1024]; \ - WARNING ("handle_putnotif: failed to write to socket #%i: %s", \ - fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ - return -1; \ - } + do { \ + if (fprintf (fh, __VA_ARGS__) < 0) { \ + char errbuf[1024]; \ + WARNING ("handle_putnotif: failed to write to socket #%i: %s", \ + fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ + return -1; \ + } \ + fflush(fh); \ + } while (0) static int set_option_severity (notification_t *n, const char *value) { diff --git a/src/utils_cmd_putval.c b/src/utils_cmd_putval.c index 4cbc2f1d..6a3c9e4e 100644 --- a/src/utils_cmd_putval.c +++ b/src/utils_cmd_putval.c @@ -26,12 +26,15 @@ #include "utils_parse_option.h" #define print_to_socket(fh, ...) \ - if (fprintf (fh, __VA_ARGS__) < 0) { \ - char errbuf[1024]; \ - WARNING ("handle_putval: failed to write to socket #%i: %s", \ - fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ - return -1; \ - } + do { \ + if (fprintf (fh, __VA_ARGS__) < 0) { \ + char errbuf[1024]; \ + WARNING ("handle_putval: failed to write to socket #%i: %s", \ + fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ + return -1; \ + } \ + fflush(fh); \ + } while (0) static int dispatch_values (const data_set_t *ds, value_list_t *vl, FILE *fh, char *buffer)