projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.0
[collectd.git]
/
src
/
utils_rrdcreate.c
diff --git
a/src/utils_rrdcreate.c
b/src/utils_rrdcreate.c
index
5f21a17
..
91ac6ce
100644
(file)
--- a/
src/utils_rrdcreate.c
+++ b/
src/utils_rrdcreate.c
@@
-103,7
+103,10
@@
static int rra_get (char ***ret, const value_list_t *vl, /* {{{ */
return (-1);
}
return (-1);
}
- ss = (cfg->stepsize > 0) ? cfg->stepsize : vl->interval;
+ if (cfg->stepsize > 0)
+ ss = cfg->stepsize;
+ else
+ ss = (int) CDTIME_T_TO_TIME_T (vl->interval);
if (ss <= 0)
{
*ret = NULL;
if (ss <= 0)
{
*ret = NULL;
@@
-153,7
+156,7
@@
static int rra_get (char ***ret, const value_list_t *vl, /* {{{ */
if (rra_num >= rra_max)
break;
if (rra_num >= rra_max)
break;
- status = ssnprintf (buffer, sizeof (buffer), "RRA:%s:%
3.1
f:%u:%u",
+ status = ssnprintf (buffer, sizeof (buffer), "RRA:%s:%
.10
f:%u:%u",
rra_types[j], cfg->xff, cdp_len, cdp_num);
if ((status < 0) || ((size_t) status >= sizeof (buffer)))
rra_types[j], cfg->xff, cdp_len, cdp_num);
if ((status < 0) || ((size_t) status >= sizeof (buffer)))
@@
-241,7
+244,9
@@
static int ds_get (char ***ret, /* {{{ */
status = ssnprintf (buffer, sizeof (buffer),
"DS:%s:%s:%i:%s:%s",
d->name, type,
status = ssnprintf (buffer, sizeof (buffer),
"DS:%s:%s:%i:%s:%s",
d->name, type,
- (cfg->heartbeat > 0) ? cfg->heartbeat : (2 * vl->interval),
+ (cfg->heartbeat > 0)
+ ? cfg->heartbeat
+ : (int) CDTIME_T_TO_TIME_T (2 * vl->interval),
min, max);
if ((status < 1) || ((size_t) status >= sizeof (buffer)))
break;
min, max);
if ((status < 1) || ((size_t) status >= sizeof (buffer)))
break;
@@
-369,6
+374,7
@@
int cu_rrd_create_file (const char *filename, /* {{{ */
int ds_num;
int status = 0;
time_t last_up;
int ds_num;
int status = 0;
time_t last_up;
+ unsigned long stepsize;
if (check_create_dir (filename))
return (-1);
if (check_create_dir (filename))
return (-1);
@@
-399,15
+405,17
@@
int cu_rrd_create_file (const char *filename, /* {{{ */
memcpy (argv + ds_num, rra_def, rra_num * sizeof (char *));
argv[ds_num + rra_num] = NULL;
memcpy (argv + ds_num, rra_def, rra_num * sizeof (char *));
argv[ds_num + rra_num] = NULL;
- if (vl->time == 0)
- last_up = time (NULL) - 10;
+ last_up = CDTIME_T_TO_TIME_T (vl->time);
+ if (last_up <= 10)
+ last_up = time (NULL);
+ last_up -= 10;
+
+ if (cfg->stepsize > 0)
+ stepsize = cfg->stepsize;
else
else
-
last_up = CDTIME_T_TO_TIME_T (vl->time) - 10
;
+
stepsize = (unsigned long) CDTIME_T_TO_TIME_T (vl->interval)
;
- assert (vl->time > 10);
- status = srrd_create (filename,
- (cfg->stepsize > 0) ? cfg->stepsize : vl->interval,
- last_up,
+ status = srrd_create (filename, stepsize, last_up,
argc, (const char **) argv);
free (argv);
argc, (const char **) argv);
free (argv);