Merge pull request #528 from paulfantom/master

[netdata.git] / src / rrd.c

diff --git a/src/rrd.c b/src/rrd.c
index 2a134fc2a8178dbe4d4e9858e64d56547e08c69c..28efff0a15074992287fba30a053c58eb9974da9 100644 (file)
--- a/src/rrd.c
+++ b/src/rrd.c
@@ -18,6 +18,7 @@
 #include "log.h"
 #include "appconfig.h"
 
+#include "main.h"
 #include "rrd.h"
 
 #define RRD_DEFAULT_GAP_INTERPOLATIONS 1
@@ -810,6 +811,8 @@ void rrdset_next_plugins(RRDSET *st)
 
 unsigned long long rrdset_done(RRDSET *st)
 {
+       if(unlikely(netdata_exit)) return 0;
+
        debug(D_RRD_CALLS, "rrdset_done() for chart %s", st->name);
 
        RRDDIM *rd, *last;
@@ -873,7 +876,7 @@ unsigned long long rrdset_done(RRDSET *st)
 
        // check if we will re-write the entire data set
        if(unlikely(usecdiff(&st->last_collected_time, &st->last_updated) > st->update_every * st->entries * 1000000ULL)) {
-               info("%s: too old data (last updated at %u.%u, last collected at %u.%u). Reseting it. Will not store the next entry.", st->name, st->last_updated.tv_sec, st->last_updated.tv_usec, st->last_collected_time.tv_sec, st->last_collected_time.tv_usec);
+               info("%s: too old data (last updated at %zu.%zu, last collected at %zu.%zu). Reseting it. Will not store the next entry.", st->name, st->last_updated.tv_sec, st->last_updated.tv_usec, st->last_collected_time.tv_sec, st->last_collected_time.tv_usec);
                rrdset_reset(st);
 
                st->usec_since_last_update = st->update_every * 1000000ULL;