X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Funixsock.c;h=57f34501f8f0dfd423c4c1c8435ea71e9caaf2bc;hb=bc51ef217e871b80152eccd4e5f32659500f75f3;hp=6a8628a55eaf8fa3dbae2c152c1e1ac461053668;hpb=a94f5335f7b6a6e6672b84adb00f576b83d46b58;p=collectd.git

diff --git a/src/unixsock.c b/src/unixsock.c
index 6a8628a5..57f34501 100644
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -164,7 +164,7 @@ static void *us_handle_client (void *arg)
 	free (arg);
 	arg = NULL;
 
-	DEBUG ("Reading from fd #%i", fd);
+	DEBUG ("unixsock plugin: us_handle_client: Reading from fd #%i", fd);
 
 	fhin  = fdopen (fd, "r");
 	if (fhin == NULL)
@@ -247,11 +247,11 @@ static void *us_handle_client (void *arg)
 		}
 		else if (strcasecmp (fields[0], "listval") == 0)
 		{
-			handle_listval (fhout, fields, fields_num);
+			handle_listval (fhout, buffer);
 		}
 		else if (strcasecmp (fields[0], "putnotif") == 0)
 		{
-			handle_putnotif (fhout, fields, fields_num);
+			handle_putnotif (fhout, buffer);
 		}
 		else if (strcasecmp (fields[0], "flush") == 0)
 		{
@@ -270,7 +270,7 @@ static void *us_handle_client (void *arg)
 		}
 	} /* while (fgets) */
 
-	DEBUG ("Exiting..");
+	DEBUG ("unixsock plugin: us_handle_client: Exiting..");
 	fclose (fhin);
 	fclose (fhout);
 
@@ -278,7 +278,7 @@ static void *us_handle_client (void *arg)
 	return ((void *) 0);
 } /* void *us_handle_client */
 
-static void *us_server_thread (void *arg)
+static void *us_server_thread (void __attribute__((unused)) *arg)
 {
 	int  status;
 	int *remote_fd;
@@ -383,8 +383,15 @@ static int us_config (const char *key, const char *val)
 
 static int us_init (void)
 {
+	static int have_init = 0;
+
 	int status;
 
+	/* Initialize only once. */
+	if (have_init != 0)
+		return (0);
+	have_init = 1;
+
 	loop = 1;
 
 	status = pthread_create (&listen_thread, NULL, us_server_thread, NULL);