X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_rrdcreate.c;h=091b5fa6dce1d2cc3bc48bb093298f39e5d0af46;hb=b4c8f3f762d666742c774ab3b45815e5a416e5da;hp=5b1323886bc8a498a77ae3216df1dadd893b851b;hpb=4dc9287f4de0283ae986444377075dcbdada2871;p=collectd.git diff --git a/src/utils_rrdcreate.c b/src/utils_rrdcreate.c index 5b132388..091b5fa6 100644 --- a/src/utils_rrdcreate.c +++ b/src/utils_rrdcreate.c @@ -156,7 +156,7 @@ static int rra_get (char ***ret, const value_list_t *vl, /* {{{ */ if (rra_num >= rra_max) break; - status = ssnprintf (buffer, sizeof (buffer), "RRA:%s:%3.1f:%u:%u", + status = ssnprintf (buffer, sizeof (buffer), "RRA:%s:%.10f:%u:%u", rra_types[j], cfg->xff, cdp_len, cdp_num); if ((status < 0) || ((size_t) status >= sizeof (buffer))) @@ -374,7 +374,7 @@ int cu_rrd_create_file (const char *filename, /* {{{ */ int ds_num; int status = 0; time_t last_up; - int stepsize; + unsigned long stepsize; if (check_create_dir (filename)) return (-1); @@ -406,18 +406,16 @@ int cu_rrd_create_file (const char *filename, /* {{{ */ argv[ds_num + rra_num] = NULL; last_up = CDTIME_T_TO_TIME_T (vl->time); - if (last_up <= 10) + if (last_up <= 0) last_up = time (NULL); - last_up -= 10; + last_up -= 1; if (cfg->stepsize > 0) stepsize = cfg->stepsize; else - stepsize = (int) CDTIME_T_TO_TIME_T (vl->interval); + stepsize = (unsigned long) CDTIME_T_TO_TIME_T (vl->interval); - status = srrd_create (filename, - (cfg->stepsize > 0) ? cfg->stepsize : CDTIME_T_TO_TIME_T (vl->interval), - last_up, + status = srrd_create (filename, stepsize, last_up, argc, (const char **) argv); free (argv);