fix for json generation when update_every is not 1 sec
Costa Tsaousis (ktsaou) committed
May 30, 2014 at 19:28 UTC
4bb4aaaa10a9325373f4039419581f74fa31aa62
1 file changed
+7
-4
netdata.c
+7
-4
@@ -2626,7 +2626,7 @@ unsigned long rrd_stats_json(int type, RRD_STATS *st, struct web_buffer *wb, int
2626
2627
long count = 0, printed = 0, group_count = 0;
2628
last_timestamp = 0;
2629
- for(t = current_entry; max_entries ; now--, t--, max_entries--) {
2629
+ for(t = current_entry; max_entries ; now -= st->update_every, t--, max_entries--) {
2630
if(t < 0) t = st->entries - 1;
2631
2632
int print_this = 0;
@@ -7352,7 +7352,10 @@ int unit_test(long delay, long shift)
7352
7353
if(v == rd->values[c]) fprintf(stderr, "passed.\n");
7354
else {
7355
- if(rd == rdabs2) fprintf(stderr, "IGNORED (expected " STORAGE_NUMBER_FORMAT ")\n", v);
7355
+ if(rd == rdabs2) {
7356
+ // FIXME: the expected numbers are wrong
7357
+ fprintf(stderr, "IGNORED (expected " STORAGE_NUMBER_FORMAT ")\n", v);
7358
+ }
7359
else {
7360
fprintf(stderr, "ERROR! (expected " STORAGE_NUMBER_FORMAT ")\n", v);
7361
ret = 1;
@@ -7401,8 +7404,8 @@ int main(int argc, char **argv)
7404
if(unit_test(2000000, 100000)) exit(1);
7405
if(unit_test(2000000, 900000)) exit(1);
7406
if(unit_test(500000, 500000)) exit(1);
7404
- //if(unit_test(500000, 100000)) exit(1);
7405
- //if(unit_test(500000, 900000)) exit(1);
7407
+ //if(unit_test(500000, 100000)) exit(1); // FIXME: the expected numbers are wrong
7408
+ //if(unit_test(500000, 900000)) exit(1); // FIXME: the expected numbers are wrong
7409
if(unit_test(500000, 0)) exit(1);
7410
fprintf(stderr, "\n\nALL TESTS PASSED\n\n");
7411
exit(0);