src/configfile.c: Fix the default interval setting.

Also fixes a bug in global_option_get_time(): Values smaller than or
equal to zero are illegal and the default value should be returned.
Thanks to @anandkarthik for spotting this!

Fixes: #727

diff --git a/src/configfile.c b/src/configfile.c
index 9841efdacf0acc4ce929ddf0a3eb07834c270c2f..fbb3cd3362f55a5e98b7e071074eb7893d8d6399 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -964,7 +964,7 @@ cdtime_t global_option_get_time (const char *name, cdtime_t def) /* {{{ */
        v = strtod (optstr, &endptr);
        if ((endptr == NULL) || (*endptr != 0) || (errno != 0))
                return (def);
-       else if (v >= 0.0)
+       else if (v <= 0.0)
                return (def);
 
        return (DOUBLE_TO_CDTIME_T (v));
@@ -972,7 +972,8 @@ cdtime_t global_option_get_time (const char *name, cdtime_t def) /* {{{ */
 
 cdtime_t cf_get_default_interval (void)
 {
-       return (global_option_get_time ("Interval", COLLECTD_DEFAULT_INTERVAL));
+       return (global_option_get_time ("Interval",
+                              DOUBLE_TO_CDTIME_T (COLLECTD_DEFAULT_INTERVAL)));
 }
 
 void cf_unregister (const char *type)