X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Femail.c;h=8fc5509f3e7e5ece33a15015b0ffa40fde6d6ede;hb=de0fdb208de123fe753c5fcf03533833777a5b4a;hp=0882ad46299b5d118494c0407c7f4a9a0f17a9cb;hpb=d9ba7e3ed5d93e9abd34f961fff51676a096ac02;p=collectd.git

diff --git a/src/email.c b/src/email.c
index 0882ad46..8fc5509f 100644
--- a/src/email.c
+++ b/src/email.c
@@ -187,12 +187,18 @@ static int email_config (const char *key, const char *value)
 			fprintf (stderr, "email plugin: `MaxConns' was set to invalid "
 					"value %li, will use default %i.\n",
 					tmp, MAX_CONNS);
+			ERROR ("email plugin: `MaxConns' was set to invalid "
+					"value %li, will use default %i.\n",
+					tmp, MAX_CONNS);
 			max_conns = MAX_CONNS;
 		}
 		else if (tmp > MAX_CONNS_LIMIT) {
 			fprintf (stderr, "email plugin: `MaxConns' was set to invalid "
 					"value %li, will use hardcoded limit %i.\n",
 					tmp, MAX_CONNS_LIMIT);
+			ERROR ("email plugin: `MaxConns' was set to invalid "
+					"value %li, will use hardcoded limit %i.\n",
+					tmp, MAX_CONNS_LIMIT);
 			max_conns = MAX_CONNS_LIMIT;
 		}
 		else {
@@ -354,8 +360,8 @@ static void *collect (void *arg)
 			}
 		} /* while (loop) */
 
-		log_debug ("[thread #%5lu] shutting down connection on fd #%i",
-				pthread_self (), fileno (this->socket));
+		log_debug ("Shutting down connection on fd #%i",
+				fileno (this->socket));
 
 		fclose (connection->socket);
 		free (connection);
@@ -372,7 +378,7 @@ static void *collect (void *arg)
 	pthread_exit ((void *)0);
 } /* static void *collect (void *) */
 
-static void *open_connection (void *arg)
+static void *open_connection (void __attribute__((unused)) *arg)
 {
 	struct sockaddr_un addr;
 
@@ -390,9 +396,7 @@ static void *open_connection (void *arg)
 	}
 
 	addr.sun_family = AF_UNIX;
-
-	strncpy (addr.sun_path, path, (size_t)(UNIX_PATH_MAX - 1));
-	addr.sun_path[UNIX_PATH_MAX - 1] = '\0';
+	sstrncpy (addr.sun_path, path, (size_t)(UNIX_PATH_MAX - 1));
 
 	errno = 0;
 	if (-1 == bind (connector_socket, (struct sockaddr *)&addr,
@@ -652,12 +656,12 @@ static void email_submit (const char *type, const char *type_instance, gauge_t v
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "email", sizeof (vl.plugin));
-	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+	sstrncpy (vl.type, type, sizeof (vl.type));
+	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void email_submit */
 
 /* Copy list l1 to list l2. l2 may partly exist already, but it is assumed