From 5bc1831cc4fd81c557cafe9e780cc3d98c5772bd Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 23 May 2018 02:25:27 +0200 Subject: [PATCH] node: improve logging --- lib/node.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/node.c b/lib/node.c index cb7be67b4..f8f28cb6e 100644 --- a/lib/node.c +++ b/lib/node.c @@ -298,15 +298,12 @@ int node_read(struct node *n, struct sample *smps[], unsigned cnt) return readd; nread += readd; - debug(LOG_NODES | 5, "Received %u samples from node %s", readd, node_name(n)); } } else { nread = n->_vt->read(n, smps, cnt); if (nread < 0) return nread; - - debug(LOG_NODES | 5, "Received %u samples from node %s", nread, node_name(n)); } /* Add missing fields */ @@ -332,17 +329,18 @@ int node_read(struct node *n, struct sample *smps[], unsigned cnt) #ifdef WITH_HOOKS /* Run read hooks */ int rread = hook_read_list(&n->hooks, smps, nread); - if (nread != rread) { - int skipped = nread - rread; + int skipped = nread - rread; - debug(LOG_NODES | 10, "Hooks skipped %u out of %u samples for node %s", skipped, nread, node_name(n)); - - if (n->stats) - stats_update(n->stats, STATS_SKIPPED, skipped); + if (skipped > 0 && n->stats != NULL) { + stats_update(n->stats, STATS_SKIPPED, skipped); } + debug(LOG_NODES | 5, "Received %u samples from node %s of which %d have been skipped", nread, node_name(n), skipped); + return rread; #else + debug(LOG_NODES | 5, "Received %u samples from node %s", nread, node_name(n)); + return nread; #endif /* WITH_HOOKS */ }