Merge remote-tracking branch 'github/pr/387'

[collectd.git] / src / email.c

diff --git a/src/email.c b/src/email.c
index 5e103ed7a82b4330a719230b31620d1df52bc903..8f633cd1d93e75224209d71017f48ff302bfb241 100644 (file)
--- a/src/email.c
+++ b/src/email.c
@@ -360,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);
@@ -376,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;
 
@@ -481,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)));
@@ -548,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;
@@ -656,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));