X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Femail.c;h=8f633cd1d93e75224209d71017f48ff302bfb241;hb=c97eef40cf19b106e6a00006a3b8f3f9ee409045;hp=e208f13049f168cbc08775366d5e01f7523c1982;hpb=2c2e9a297f59c110ddd4adef6293fe80f39f15b7;p=collectd.git

diff --git a/src/email.c b/src/email.c
index e208f130..8f633cd1 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);
@@ -370,9 +376,10 @@ static void *collect (void *arg)
 	} /* while (1) */
 
 	pthread_exit ((void *)0);
+	return ((void *) 0);
 } /* static void *collect (void *) */
 
-static void *open_connection (void *arg)
+static void *open_connection (void __attribute__((unused)) *arg)
 {
 	struct sockaddr_un addr;
 
@@ -475,8 +482,8 @@ static void *open_connection (void *arg)
 			collectors[i] = (collector_t *)smalloc (sizeof (collector_t));
 			collectors[i]->socket = NULL;
 
-			if (0 != (err = pthread_create (&collectors[i]->thread, &ptattr,
-							collect, collectors[i]))) {
+			if (0 != (err = plugin_thread_create (&collectors[i]->thread,
+							&ptattr, collect, collectors[i]))) {
 				char errbuf[1024];
 				log_err ("pthread_create() failed: %s",
 						sstrerror (errno, errbuf, sizeof (errbuf)));
@@ -542,14 +549,16 @@ static void *open_connection (void *arg)
 
 		pthread_cond_signal (&conn_available);
 	}
-	pthread_exit ((void *)0);
+
+	pthread_exit ((void *) 0);
+	return ((void *) 0);
 } /* static void *open_connection (void *) */
 
 static int email_init (void)
 {
 	int err = 0;
 
-	if (0 != (err = pthread_create (&connector, NULL,
+	if (0 != (err = plugin_thread_create (&connector, NULL,
 				open_connection, NULL))) {
 		char errbuf[1024];
 		disabled = 1;
@@ -650,7 +659,6 @@ 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));
 	sstrncpy (vl.type, type, sizeof (vl.type));