Merge branch 'collectd-4.5' into collectd-4.6

[collectd.git] / src / email.c

diff --git a/src/email.c b/src/email.c
index e208f13..8fc5509 100644 (file)
--- 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;
 
@@ -650,7 +656,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));