X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.c;h=6b77d59908233f260b5d1903e38380dbb79d2680;hb=631874e4161f9ac8651158aa81f0e7f8aa896ed9;hp=576abef48c7110575d3a7452008c4a28970db3c4;hpb=619f112a584fcd89d2e8df7781a0a01341188189;p=collectd.git

diff --git a/src/collectd.c b/src/collectd.c
index 576abef4..6b77d599 100644
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -41,6 +41,7 @@
  */
 char hostname_g[DATA_MAX_NAME_LEN];
 int  interval_g;
+int  timeout_g;
 #if HAVE_LIBKSTAT
 kstat_ctl_t *kc;
 #endif /* HAVE_LIBKSTAT */
@@ -76,6 +77,7 @@ static void sig_usr1_handler (int __attribute__((unused)) signal)
 	pthread_attr_init (&attr);
 	pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
 	pthread_create (&thread, &attr, do_flush, NULL);
+	pthread_attr_destroy (&attr);
 }
 
 static int init_hostname (void)
@@ -102,9 +104,7 @@ static int init_hostname (void)
 	}
 
 	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));
@@ -150,6 +150,18 @@ static int init_global_variables (void)
 	}
 	DEBUG ("interval_g = %i;", interval_g);
 
+	str = global_option_get ("Timeout");
+	if (str == NULL)
+		str = "2";
+	timeout_g = atoi (str);
+	if (timeout_g <= 1)
+	{
+		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);
@@ -159,10 +171,11 @@ static int init_global_variables (void)
 
 static int change_basedir (const char *orig_dir)
 {
-	char *dir = strdup (orig_dir);
-	int dirlen;
+	char *dir;
+	size_t dirlen;
 	int status;
 
+	dir = strdup (orig_dir);
 	if (dir == NULL)
 	{
 		char errbuf[1024];
@@ -179,39 +192,41 @@ static int change_basedir (const char *orig_dir)
 		return (-1);
 
 	status = chdir (dir);
-	free (dir);
+	if (status == 0)
+	{
+		free (dir);
+		return (0);
+	}
+	else if (errno != ENOENT)
+	{
+		char errbuf[1024];
+		ERROR ("change_basedir: chdir (%s): %s", dir,
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		free (dir);
+		return (-1);
+	}
 
+	status = mkdir (dir, S_IRWXU | S_IRWXG | S_IRWXO);
 	if (status != 0)
 	{
-		if (errno == ENOENT)
-		{
-			if (mkdir (orig_dir, 0755) == -1)
-			{
-				char errbuf[1024];
-				ERROR ("change_basedir: mkdir (%s): %s", orig_dir,
-						sstrerror (errno, errbuf,
-							sizeof (errbuf)));
-				return (-1);
-			}
-			else if (chdir (orig_dir) == -1)
-			{
-				char errbuf[1024];
-				ERROR ("chdir (%s): %s", orig_dir,
-						sstrerror (errno, errbuf,
-							sizeof (errbuf)));
-				return (-1);
-			}
-		}
-		else
-		{
-			char errbuf[1024];
-			ERROR ("chdir (%s): %s", orig_dir,
-					sstrerror (errno, errbuf,
-						sizeof (errbuf)));
-			return (-1);
-		}
+		char errbuf[1024];
+		ERROR ("change_basedir: mkdir (%s): %s", dir,
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		free (dir);
+		return (-1);
 	}
 
+	status = chdir (dir);
+	if (status != 0)
+	{
+		char errbuf[1024];
+		ERROR ("change_basedir: chdir (%s): %s", dir,
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		free (dir);
+		return (-1);
+	}
+
+	free (dir);
 	return (0);
 } /* static int change_basedir (char *dir) */
 
@@ -261,9 +276,10 @@ static void exit_usage (int status)
 #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");