X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Funixsock.c;h=6de1395662161a66aaacafa389efa1e680583bf9;hb=908956b8c46180d0905478e9c1e110d5213f2808;hp=0b897482c9d956547d74be3f905f9d9941b157be;hpb=f02efdb47ff2037ff0365fdd5c3c1b6a418c3431;p=collectd.git

diff --git a/src/unixsock.c b/src/unixsock.c
index 0b897482..6de13956 100644
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -54,7 +54,8 @@ static const char *config_keys[] =
 {
 	"SocketFile",
 	"SocketGroup",
-	"SocketPerms"
+	"SocketPerms",
+	"DeleteSocket"
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
@@ -65,6 +66,7 @@ static int   sock_fd    = -1;
 static char *sock_file  = NULL;
 static char *sock_group = NULL;
 static int   sock_perms = S_IRWXU | S_IRWXG;
+static _Bool delete_socket = 0;
 
 static pthread_t listen_thread = (pthread_t) 0;
 
@@ -89,10 +91,27 @@ static int us_open_socket (void)
 	sa.sun_family = AF_UNIX;
 	sstrncpy (sa.sun_path, (sock_file != NULL) ? sock_file : US_DEFAULT_PATH,
 			sizeof (sa.sun_path));
-	/* unlink (sa.sun_path); */
 
 	DEBUG ("unixsock plugin: socket path = %s", sa.sun_path);
 
+	if (delete_socket)
+	{
+		errno = 0;
+		status = unlink (sa.sun_path);
+		if ((status != 0) && (errno != ENOENT))
+		{
+			char errbuf[1024];
+			WARNING ("unixsock plugin: Deleting socket file \"%s\" failed: %s",
+					sa.sun_path,
+					sstrerror (errno, errbuf, sizeof (errbuf)));
+		}
+		else if (status == 0)
+		{
+			INFO ("unixsock plugin: Successfully deleted socket file \"%s\".",
+					sa.sun_path);
+		}
+	}
+
 	status = bind (sock_fd, (struct sockaddr *) &sa, sizeof (sa));
 	if (status != 0)
 	{
@@ -392,6 +411,13 @@ static int us_config (const char *key, const char *val)
 	{
 		sock_perms = (int) strtol (val, NULL, 8);
 	}
+	else if (strcasecmp (key, "DeleteSocket") == 0)
+	{
+		if (IS_TRUE (val))
+			delete_socket = 1;
+		else
+			delete_socket = 0;
+	}
 	else
 	{
 		return (-1);