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 ed10e34..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 {
@@ -243,7 +249,6 @@ static void type_list_incr (type_list_t *list, char *name, int incr)
 static void *collect (void *arg)
 {
        collector_t *this = (collector_t *)arg;
-       pthread_t    self = pthread_self ();
 
        while (1) {
                int loop = 1;
@@ -269,8 +274,8 @@ static void *collect (void *arg)
                 * thread and connection management */
                this->socket = connection->socket;
 
-               log_debug ("[thread #%5lu] handling connection on fd #%i",
-                               self, fileno (this->socket));
+               log_debug ("collect: handling connection on fd #%i",
+                               fileno (this->socket));
 
                while (loop) {
                        /* 256 bytes ought to be enough for anybody ;-) */
@@ -283,8 +288,8 @@ static void *collect (void *arg)
 
                                if (0 != errno) {
                                        char errbuf[1024];
-                                       log_err ("[thread #%5lu] reading from socket (fd #%i) "
-                                                       "failed: %s", self, fileno (this->socket),
+                                       log_err ("collect: reading from socket (fd #%i) "
+                                                       "failed: %s", fileno (this->socket),
                                                        sstrerror (errno, errbuf, sizeof (errbuf)));
                                }
                                break;
@@ -292,8 +297,8 @@ static void *collect (void *arg)
 
                        len = strlen (line);
                        if (('\n' != line[len - 1]) && ('\r' != line[len - 1])) {
-                               log_warn ("[thread #%5lu] line too long (> %lu characters): "
-                                               "'%s' (truncated)", self, sizeof (line) - 1, line);
+                               log_warn ("collect: line too long (> %zu characters): "
+                                               "'%s' (truncated)", sizeof (line) - 1, line);
 
                                while (NULL != fgets (line, sizeof (line), this->socket))
                                        if (('\n' == line[len - 1]) || ('\r' == line[len - 1]))
@@ -303,11 +308,10 @@ static void *collect (void *arg)
 
                        line[len - 1] = '\0';
 
-                       log_debug ("[thread #%5lu] line = '%s'", self, line);
+                       log_debug ("collect: line = '%s'", line);
 
                        if (':' != line[1]) {
-                               log_err ("[thread #%5lu] syntax error in line '%s'",
-                                               self, line);
+                               log_err ("collect: syntax error in line '%s'", line);
                                continue;
                        }
 
@@ -318,8 +322,7 @@ static void *collect (void *arg)
                                int  bytes = 0;
 
                                if (NULL == tmp) {
-                                       log_err ("[thread #%5lu] syntax error in line '%s'",
-                                                       self, line);
+                                       log_err ("collect: syntax error in line '%s'", line);
                                        continue;
                                }
 
@@ -353,12 +356,12 @@ static void *collect (void *arg)
                                } while (NULL != (type = strtok_r (NULL, ",", &ptr)));
                        }
                        else {
-                               log_err ("[thread #%5lu] unknown type '%c'", self, line[0]);
+                               log_err ("collect: unknown type '%c'", line[0]);
                        }
                } /* 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);
@@ -375,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;
 
@@ -393,10 +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';
-       unlink (addr.sun_path);
+       sstrncpy (addr.sun_path, path, (size_t)(UNIX_PATH_MAX - 1));
 
        errno = 0;
        if (-1 == bind (connector_socket, (struct sockaddr *)&addr,
@@ -656,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);
-       strcpy (vl.host, hostname_g);
-       strcpy (vl.plugin, "email");
-       strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+       sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+       sstrncpy (vl.plugin, "email", sizeof (vl.plugin));
+       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