X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconfigfile.c;fp=src%2Fconfigfile.c;h=d3d3841250fae0c784706cb512ad5b35b68553ba;hb=5e02dec23bf3c5ed671412c8a48fd0deaade8ba3;hp=05d41cd34bdc525321bf35e72481d95d660289f7;hpb=e9efa3d6fbb2c6dce9b438a763ddaf3439e548b2;p=collectd.git diff --git a/src/configfile.c b/src/configfile.c index 05d41cd3..d3d38412 100644 --- a/src/configfile.c +++ b/src/configfile.c @@ -289,14 +289,10 @@ static int dispatch_loadplugin (const oconfig_item_t *ci) if (strcasecmp("Globals", ci->children[i].key) == 0) cf_util_get_flag (ci->children + i, &flags, PLUGIN_FLAGS_GLOBAL); else if (strcasecmp ("Interval", ci->children[i].key) == 0) { - double interval = 0.0; - - if (cf_util_get_double (ci->children + i, &interval) != 0) { - /* cf_util_get_double will log an error */ + if (cf_util_get_cdtime (ci->children + i, &ctx.interval) != 0) { + /* cf_util_get_cdtime will log an error */ continue; } - - ctx.interval = DOUBLE_TO_CDTIME_T (interval); } else { WARNING("Ignoring unknown LoadPlugin option \"%s\" " @@ -938,19 +934,19 @@ const char *global_option_get (const char *option) long global_option_get_long (const char *option, long default_value) { - const char *str; - long value; + const char *str; + long value; - str = global_option_get (option); - if (NULL == str) - return (default_value); + str = global_option_get (option); + if (NULL == str) + return (default_value); - errno = 0; - value = strtol (str, /* endptr = */ NULL, /* base = */ 0); - if (errno != 0) - return (default_value); + errno = 0; + value = strtol (str, /* endptr = */ NULL, /* base = */ 0); + if (errno != 0) + return (default_value); - return (value); + return (value); } /* char *global_option_get_long */ cdtime_t cf_get_default_interval (void)