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.3
[collectd.git]
/
src
/
utils_cmd_putval.c
diff --git
a/src/utils_cmd_putval.c
b/src/utils_cmd_putval.c
index
15cd939
..
4cbc2f1
100644
(file)
--- a/
src/utils_cmd_putval.c
+++ b/
src/utils_cmd_putval.c
@@
-56,16
+56,16
@@
static int set_option (value_list_t *vl, const char *key, const char *value)
if (strcasecmp ("interval", key) == 0)
{
if (strcasecmp ("interval", key) == 0)
{
-
int
tmp;
+
double
tmp;
char *endptr;
endptr = NULL;
errno = 0;
char *endptr;
endptr = NULL;
errno = 0;
- tmp = strto
l (value, &endptr, 0
);
+ tmp = strto
d (value, &endptr
);
if ((errno == 0) && (endptr != NULL)
if ((errno == 0) && (endptr != NULL)
- && (endptr != value) && (tmp > 0))
- vl->interval =
tmp
;
+ && (endptr != value) && (tmp > 0
.0
))
+ vl->interval =
DOUBLE_TO_CDTIME_T (tmp)
;
}
else
return (1);
}
else
return (1);
@@
-246,9
+246,11
@@
int create_putval (char *ret, size_t ret_len, /* {{{ */
escape_string (buffer_values, sizeof (buffer_values));
ssnprintf (ret, ret_len,
escape_string (buffer_values, sizeof (buffer_values));
ssnprintf (ret, ret_len,
- "PUTVAL %s interval=%
i
%s",
+ "PUTVAL %s interval=%
.3f
%s",
buffer_ident,
buffer_ident,
- (vl->interval > 0) ? vl->interval : interval_g,
+ (vl->interval > 0)
+ ? CDTIME_T_TO_DOUBLE (vl->interval)
+ : CDTIME_T_TO_DOUBLE (plugin_get_interval ()),
buffer_values);
return (0);
buffer_values);
return (0);