X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.c;h=4e521f9f6b40835ab34d16896717ffc347e99e2c;hb=7e44a991736f5b26f035711bb9296a176722edaf;hp=49998f96101b9c7d94e48d76aa92c63c7b80eff9;hpb=5afa2f82d43e2a7952d8f347f6f40b5778c59db8;p=collectd.git

diff --git a/src/collectd.c b/src/collectd.c
index 49998f96..4e521f9f 100644
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -23,9 +23,16 @@
 #include "collectd.h"
 #include "common.h"
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
 #include "plugin.h"
 #include "configfile.h"
-#include "types_list.h"
+
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif
 
 /*
  * Global variables
@@ -48,25 +55,67 @@ static void sigTermHandler (int signal)
 	loop++;
 }
 
-static int init_global_variables (void)
+static int init_hostname (void)
 {
 	const char *str;
 
+	struct addrinfo  ai_hints;
+	struct addrinfo *ai_list;
+	struct addrinfo *ai_ptr;
+	int status;
+
 	str = global_option_get ("Hostname");
 	if (str != NULL)
 	{
 		strncpy (hostname_g, str, sizeof (hostname_g));
+		hostname_g[sizeof (hostname_g) - 1] = '\0';
+		return (0);
 	}
-	else
+
+	if (gethostname (hostname_g, sizeof (hostname_g)) != 0)
 	{
-		if (gethostname (hostname_g, sizeof (hostname_g)) != 0)
-		{
-			fprintf (stderr, "`gethostname' failed and no "
-					"hostname was configured.\n");
-			return (-1);
-		}
+		fprintf (stderr, "`gethostname' failed and no "
+				"hostname was configured.\n");
+		return (-1);
 	}
-	DEBUG ("hostname_g = %s;", hostname_g);
+
+	str = global_option_get ("FQDNLookup");
+	if ((strcasecmp ("false", str) == 0)
+			|| (strcasecmp ("no", str) == 0)
+			|| (strcasecmp ("off", str) == 0))
+		return (0);
+
+	memset (&ai_hints, '\0', sizeof (ai_hints));
+	ai_hints.ai_flags = AI_CANONNAME;
+
+	status = getaddrinfo (hostname_g, NULL, &ai_hints, &ai_list);
+	if (status != 0)
+	{
+		ERROR ("Looking up \"%s\" failed. You have set the "
+				"\"FQDNLookup\" option, but I cannot resolve "
+				"my hostname to a fully qualified domain "
+				"name. Please fix you network "
+				"configuration.", hostname_g);
+		return (-1);
+	}
+
+	for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
+	{
+		if (ai_ptr->ai_canonname == NULL)
+			continue;
+
+		strncpy (hostname_g, ai_ptr->ai_canonname, sizeof (hostname_g));
+		hostname_g[sizeof (hostname_g) - 1] = '\0';
+		break;
+	}
+
+	freeaddrinfo (ai_list);
+	return (0);
+} /* int init_hostname */
+
+static int init_global_variables (void)
+{
+	const char *str;
 
 	str = global_option_get ("Interval");
 	if (str == NULL)
@@ -80,6 +129,10 @@ static int init_global_variables (void)
 	}
 	DEBUG ("interval_g = %i;", interval_g);
 
+	if (init_hostname () != 0)
+		return (-1);
+	DEBUG ("hostname_g = %s;", hostname_g);
+
 	return (0);
 } /* int init_global_variables */
 
@@ -114,7 +167,7 @@ static int change_basedir (const char *orig_dir)
 			if (mkdir (orig_dir, 0755) == -1)
 			{
 				char errbuf[1024];
-				ERROR ("mkdir (%s): %s", orig_dir,
+				ERROR ("change_basedir: mkdir (%s): %s", orig_dir,
 						sstrerror (errno, errbuf,
 							sizeof (errbuf)));
 				return (-1);
@@ -170,7 +223,7 @@ static void update_kstat (void)
 /* TODO
  * Remove all settings but `-f' and `-C'
  */
-static void exit_usage (char *name)
+static void exit_usage (void)
 {
 	printf ("Usage: "PACKAGE" [OPTIONS]\n\n"
 			
@@ -214,7 +267,6 @@ static int do_init (void)
 	}
 #endif
 
-	read_types_list ();
 	plugin_init_all ();
 
 	return (0);
@@ -244,7 +296,7 @@ static int do_loop (void)
 #endif
 
 		/* Issue all plugins */
-		plugin_read_all (&loop);
+		plugin_read_all ();
 
 		if (gettimeofday (&tv_now, NULL) < 0)
 		{
@@ -320,6 +372,7 @@ int main (int argc, char **argv)
 	struct sigaction sigIntAction;
 	struct sigaction sigTermAction;
 	char *configfile = CONFIGFILE;
+	int test_config  = 0;
 	const char *basedir;
 #if COLLECT_DAEMON
 	struct sigaction sigChldAction;
@@ -332,7 +385,7 @@ int main (int argc, char **argv)
 	{
 		int c;
 
-		c = getopt (argc, argv, "hC:"
+		c = getopt (argc, argv, "htC:"
 #if COLLECT_DAEMON
 				"fP:"
 #endif
@@ -346,6 +399,9 @@ int main (int argc, char **argv)
 			case 'C':
 				configfile = optarg;
 				break;
+			case 't':
+				test_config = 1;
+				break;
 #if COLLECT_DAEMON
 			case 'P':
 				global_option_set ("PIDFile", optarg);
@@ -356,7 +412,7 @@ int main (int argc, char **argv)
 #endif /* COLLECT_DAEMON */
 			case 'h':
 			default:
-				exit_usage (argv[0]);
+				exit_usage ();
 		} /* switch (c) */
 	} /* while (1) */
 
@@ -397,6 +453,9 @@ int main (int argc, char **argv)
 	if (init_global_variables () != 0)
 		return (1);
 
+	if (test_config)
+		return (0);
+
 #if COLLECT_DAEMON
 	/*
 	 * fork off child