Merge branch 'collectd-4.5' into collectd-4.6

diff --git a/src/email.c b/src/email.c
index f79217c..8fc5509 100644 (file)
--- a/src/email.c
+++ b/src/email.c
@@ -360,8 +360,8 @@ static void *collect (void *arg)
                        }
                } /* while (loop) */
 
-               log_debug ("[thread #%5lu] shutting down connection on fd #%i",
-                               pthread_self (), fileno (this->socket));
+               log_debug ("Shutting down connection on fd #%i",
+                               fileno (this->socket));
 
                fclose (connection->socket);
                free (connection);

diff --git a/src/memory.c b/src/memory.c
index 2d90de3..6ea6205 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -208,7 +208,7 @@ static int memory_read (void)
                                        NULL, 0) == 0)
                {
                        sysctl_vals[i] = value;
-                       DEBUG ("memory plugin: %26s: %6i", sysctl_keys[i], sysctl_vals[i]);
+                       DEBUG ("memory plugin: %26s: %g", sysctl_keys[i], sysctl_vals[i]);
                }
                else
                {

diff --git a/src/processes.c b/src/processes.c
index 3afd2f0..559ba97 100644 (file)
--- a/src/processes.c
+++ b/src/processes.c
@@ -1358,9 +1358,9 @@ static int ps_read (void)
                pse.num_proc = 1;
                pse.num_lwp  = procs[i].ki_numthreads;
 
-               pse.vmem_size = procs[i].ki_size;
+               /* pse.vmem_size = procs[i].ki_size; */
                pse.vmem_rss = procs[i].ki_rssize * getpagesize();
-               pse.stack_size = procs[i].ki_ssize * getpagesize();
+               /* pse.stack_size = procs[i].ki_ssize * getpagesize(); */
                pse.vmem_minflt = 0;
                pse.vmem_minflt_counter = procs[i].ki_rusage.ru_minflt;
                pse.vmem_majflt = 0;