source/collectd
1
0
Fork 0
mirror of https://github.com/collectd/collectd.git synced 2026-02-09 04:09:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'collectd-5.6' into collectd-5.7

Browse Source
This commit is contained in:
Florian Forster
2017-09-21 17:22:39 +02:00
parent 8339b50c3c 6c082e9554
commit 01d23e3f5d
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/redhat/collectd.spec
View File

@@ -501,8 +501,8 @@ the byte- and packet-counters of selected rules and submit them to collectd.
Summary: Java plugin for collectd
Group: System Environment/Daemons
Requires: %{name}%{?_isa} = %{version}-%{release}
BuildRequires: java-devel, jpackage-utils
Requires: java, jpackage-utils
BuildRequires: java-devel >= 1.6, jpackage-utils >= 1.6
Requires: java >= 1.6, jpackage-utils >= 1.6
%description java
This plugin for collectd allows plugins to be written in Java and executed
in an embedded JVM.

4
src/network.c
View File

@@ -1230,9 +1230,9 @@ static int parse_part_encr_aes256(sockent_t *se, /* {{{ */
part_size - buffer_offset,
/* in = */ NULL, /* in len = */ 0);
if (err != 0) {
sfree(pea.username);
ERROR("network plugin: gcry_cipher_decrypt returned: %s. Username: %s",
gcry_strerror(err), pea.username);
sfree(pea.username);
return (-1);
}
@@ -1254,8 +1254,6 @@ static int parse_part_encr_aes256(sockent_t *se, /* {{{ */
parse_packet(se, buffer + buffer_offset, payload_len, flags | PP_ENCRYPTED,
pea.username);
/* XXX: Free pea.username?!? */
/* Update return values */
*ret_buffer = buffer + part_size;
*ret_buffer_len = buffer_len - part_size;

4
src/ntpd.c
View File

@@ -850,9 +850,9 @@ static int ntpd_read(void) {
}
/* kerninfo -> estimated error */
offset_loop = scale_loop * ((gauge_t)ntohl(ik->offset));
offset_loop = (gauge_t)((int32_t)ntohl(ik->offset) * scale_loop);
freq_loop = ntpd_read_fp(ik->freq);
offset_error = scale_error * ((gauge_t)ntohl(ik->esterror));
offset_error = (gauge_t)((int32_t)ntohl(ik->esterror) * scale_error);
DEBUG("info_kernel:\n"
" pll offset = %.8g\n"

6
src/perl.c
View File

@@ -2618,6 +2618,12 @@ static int perl_config_plugin(pTHX_ oconfig_item_t *ci) {
char *plugin;
HV *config;
if (NULL == perl_threads) {
log_err("A `Plugin' block was encountered but no plugin was loaded yet. "
"Put the appropriate `LoadPlugin' option in front of it.");
return -1;
}
dSP;
if ((1 != ci->values_num) || (OCONFIG_TYPE_STRING != ci->values[0].type)) {