From 5b36272b7347f2f28b8c1ab02a20c4b93a54c20f Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Thu, 28 Sep 2017 11:34:42 +0200 Subject: [PATCH] fix indention, revert merge failures --- src/collectd.conf.in | 2 +- src/processes.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/collectd.conf.in b/src/collectd.conf.in index 0940c749..c2b3598e 100644 --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@ -1170,7 +1170,7 @@ # # CollectFileDescriptor true # CollectContextSwitch true -# CollectMemoryMaps true +# CollectMemoryMaps true # Process "name" # ProcessMatch "name" "regex" # diff --git a/src/processes.c b/src/processes.c index d2b6fee7..459ab985 100644 --- a/src/processes.c +++ b/src/processes.c @@ -752,7 +752,7 @@ static void ps_submit_proc_list(procstat_t *ps) { plugin_dispatch_values(&vl); if ((ps->io_rchar != -1) && (ps->io_wchar != -1)) { - sstrncpy(vl.type, "ps_disk_octets", sizeof(vl.type)); + sstrncpy(vl.type, "io_octets", sizeof(vl.type)); vl.values[0].derive = ps->io_rchar; vl.values[1].derive = ps->io_wchar; vl.values_len = 2; @@ -775,7 +775,7 @@ static void ps_submit_proc_list(procstat_t *ps) { plugin_dispatch_values(&vl); } - if (ps->num_fd > 0) { + if (ps->num_fd > 0) { sstrncpy(vl.type, "file_handles", sizeof(vl.type)); vl.values[0].gauge = ps->num_fd; vl.values_len = 1; -- 2.11.0