diff --git a/src/collectd.c b/src/collectd.c
index 576abef48c7110575d3a7452008c4a28970db3c4..9a4ba08ca7a3ea7ebbdedd1bfb6c265d1fe5e5a1 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
*/
char hostname_g[DATA_MAX_NAME_LEN];
int interval_g;
+int timeout_g;
#if HAVE_LIBKSTAT
kstat_ctl_t *kc;
#endif /* HAVE_LIBKSTAT */
}
str = global_option_get ("FQDNLookup");
- if ((strcasecmp ("false", str) == 0)
- || (strcasecmp ("no", str) == 0)
- || (strcasecmp ("off", str) == 0))
+ if (IS_FALSE (str))
return (0);
memset (&ai_hints, '\0', sizeof (ai_hints));
}
DEBUG ("interval_g = %i;", interval_g);
+ str = global_option_get ("Timeout");
+ if (str == NULL)
+ str = "10";
+ timeout_g = atoi (str);
+ if (timeout_g <= 0)
+ {
+ fprintf (stderr, "Cannot set the timeout to a correct value.\n"
+ "Please check your settings.\n");
+ return (-1);
+ }
+ DEBUG ("timeout_g = %i;", timeout_g);
+
if (init_hostname () != 0)
return (-1);
DEBUG ("hostname_g = %s;", hostname_g);
#endif
" -h Display help (this message)\n"
"\nBuiltin defaults:\n"
- " Config-File "CONFIGFILE"\n"
- " PID-File "PIDFILE"\n"
- " Data-Directory "PKGLOCALSTATEDIR"\n"
+ " Config file "CONFIGFILE"\n"
+ " PID file "PIDFILE"\n"
+ " Plugin directory "PLUGINDIR"\n"
+ " Data directory "PKGLOCALSTATEDIR"\n"
"\n"PACKAGE" "VERSION", http://collectd.org/\n"
"by Florian octo Forster <octo@verplant.org>\n"
"for contributions see `AUTHORS'\n");