X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Femail.c;h=c78d76146835ab2e55bedac09c8a36f71752e132;hb=9861c52f3ff659035062f0927ca8442341eff4ce;hp=ed0f9a2f8a1a3692a9e2d1ea2920e3f33ab22f90;hpb=d561a8387f633491bdcd7fe6964f0b63ae694af5;p=collectd.git diff --git a/src/email.c b/src/email.c index ed0f9a2f..c78d7614 100644 --- a/src/email.c +++ b/src/email.c @@ -4,8 +4,7 @@ * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * Free Software Foundation; only version 2 of the License is applicable. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -40,24 +39,15 @@ #include "configfile.h" +#include + #if HAVE_LIBPTHREAD # include #endif -#if HAVE_SYS_SELECT_H -# include -#endif /* HAVE_SYS_SELECT_H */ - -#if HAVE_SYS_SOCKET_H -# include -#endif /* HAVE_SYS_SOCKET_H */ - -/* *sigh* glibc does not define UNIX_PATH_MAX in sys/un.h ... */ -#if HAVE_LINUX_UN_H -# include -#elif HAVE_SYS_UN_H -# include -#endif /* HAVE_LINUX_UN_H | HAVE_SYS_UN_H */ +#include +#include +#include /* some systems (e.g. Darwin) seem to not define UNIX_PATH_MAX at all */ #ifndef UNIX_PATH_MAX @@ -73,16 +63,12 @@ /* 256 bytes ought to be enough for anybody ;-) */ #define BUFSIZE 256 -#ifndef COLLECTD_SOCKET_PREFIX -# define COLLECTD_SOCKET_PREFIX "/tmp/.collectd-" -#endif /* COLLECTD_SOCKET_PREFIX */ - -#define SOCK_PATH COLLECTD_SOCKET_PREFIX"email" +#define SOCK_PATH LOCALSTATEDIR"/run/"PACKAGE_NAME"-email" #define MAX_CONNS 5 #define MAX_CONNS_LIMIT 16384 -#define log_err(...) syslog (LOG_ERR, MODULE_NAME": "__VA_ARGS__) -#define log_warn(...) syslog (LOG_WARNING, MODULE_NAME": "__VA_ARGS__) +#define log_err(...) ERROR (MODULE_NAME": "__VA_ARGS__) +#define log_warn(...) WARNING (MODULE_NAME": "__VA_ARGS__) /* * Private data structures @@ -131,43 +117,15 @@ typedef struct { /* valid configuration file keys */ static const char *config_keys[] = { + "SocketFile", "SocketGroup", "SocketPerms", "MaxConns" }; static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); -static data_source_t gauge_dsrc[1] = -{ - {"value", DS_TYPE_GAUGE, 0.0, NAN} -}; - -static data_set_t email_count_ds = -{ - "email_count", 1, gauge_dsrc -}; - -static data_set_t email_size_ds = -{ - "email_size", 1, gauge_dsrc -}; - -static data_set_t spam_check_ds = -{ - "spam_check", 1, gauge_dsrc -}; - -static data_source_t spam_score_dsrc[1] = -{ - {"score", DS_TYPE_GAUGE, NAN, NAN} -}; - -static data_set_t spam_score_ds = -{ - "spam_score", 1, spam_score_dsrc -}; - /* socket configuration */ +static char *sock_file = SOCK_PATH; static char *sock_group = COLLECTD_GRP_NAME; static int sock_perms = S_IRWXU | S_IRWXG; static int max_conns = MAX_CONNS; @@ -176,8 +134,8 @@ static int max_conns = MAX_CONNS; static int disabled = 0; /* thread managing "client" connections */ -static pthread_t connector; -static int connector_socket; +static pthread_t connector = (pthread_t) 0; +static int connector_socket = -1; /* tell the collector threads that a new connection is available */ static pthread_cond_t conn_available = PTHREAD_COND_INITIALIZER; @@ -190,7 +148,7 @@ static conn_list_t conns; static pthread_cond_t collector_available = PTHREAD_COND_INITIALIZER; /* collector threads */ -static collector_t **collectors; +static collector_t **collectors = NULL; static pthread_mutex_t available_mutex = PTHREAD_MUTEX_INITIALIZER; static int available_collectors; @@ -213,7 +171,10 @@ static type_list_t check; */ static int email_config (const char *key, const char *value) { - if (0 == strcasecmp (key, "SocketGroup")) { + if (0 == strcasecmp (key, "SocketFile")) { + sock_file = sstrdup (value); + } + else if (0 == strcasecmp (key, "SocketGroup")) { sock_group = sstrdup (value); } else if (0 == strcasecmp (key, "SocketPerms")) { @@ -292,7 +253,9 @@ static char read_char (conn_t *src) FD_SET (src->socket, &fdset); if (-1 == select (src->socket + 1, &fdset, NULL, NULL, NULL)) { - log_err ("select() failed: %s", strerror (errno)); + char errbuf[1024]; + log_err ("select() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); return '\0'; } @@ -304,7 +267,9 @@ static char read_char (conn_t *src) errno = 0; if (0 > (len = read (src->socket, (void *)&ret, 1))) { if (EINTR != errno) { - log_err ("read() failed: %s", strerror (errno)); + char errbuf[1024]; + log_err ("read() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); return '\0'; } } @@ -353,7 +318,9 @@ static char *read_line (conn_t *src) FD_SET (src->socket, &fdset); if (-1 == select (src->socket + 1, &fdset, NULL, NULL, NULL)) { - log_err ("select() failed: %s", strerror (errno)); + char errbuf[1024]; + log_err ("select() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); return NULL; } @@ -365,7 +332,9 @@ static char *read_line (conn_t *src) (void *)(src->buffer + src->idx), BUFSIZE - src->idx))) { if (EINTR != errno) { - log_err ("read() failed: %s", strerror (errno)); + char errbuf[1024]; + log_err ("read() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); return NULL; } } @@ -437,13 +406,17 @@ static void *collect (void *arg) errno = 0; if (-1 == fcntl (connection->socket, F_GETFL, &flags)) { - log_err ("fcntl() failed: %s", strerror (errno)); + char errbuf[1024]; + log_err ("fcntl() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); loop = 0; } errno = 0; if (-1 == fcntl (connection->socket, F_SETFL, flags | O_NONBLOCK)) { - log_err ("fcntl() failed: %s", strerror (errno)); + char errbuf[1024]; + log_err ("fcntl() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); loop = 0; } } @@ -507,9 +480,10 @@ static void *collect (void *arg) } /* while (loop) */ close (connection->socket); - free (connection); + this->socket = -1; + pthread_mutex_lock (&available_mutex); ++available_collectors; pthread_mutex_unlock (&available_mutex); @@ -528,30 +502,37 @@ static void *open_connection (void *arg) /* create UNIX socket */ errno = 0; if (-1 == (connector_socket = socket (PF_UNIX, SOCK_STREAM, 0))) { + char errbuf[1024]; disabled = 1; - log_err ("socket() failed: %s", strerror (errno)); + log_err ("socket() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); pthread_exit ((void *)1); } addr.sun_family = AF_UNIX; - strncpy (addr.sun_path, SOCK_PATH, (size_t)(UNIX_PATH_MAX - 1)); + strncpy (addr.sun_path, sock_file, (size_t)(UNIX_PATH_MAX - 1)); addr.sun_path[UNIX_PATH_MAX - 1] = '\0'; - unlink (addr.sun_path); errno = 0; if (-1 == bind (connector_socket, (struct sockaddr *)&addr, offsetof (struct sockaddr_un, sun_path) + strlen(addr.sun_path))) { + char errbuf[1024]; disabled = 1; - log_err ("bind() failed: %s", strerror (errno)); + connector_socket = -1; /* TODO: close? */ + log_err ("bind() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); pthread_exit ((void *)1); } errno = 0; if (-1 == listen (connector_socket, 5)) { + char errbuf[1024]; disabled = 1; - log_err ("listen() failed: %s", strerror (errno)); + connector_socket = -1; /* TODO: close? */ + log_err ("listen() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); pthread_exit ((void *)1); } @@ -566,7 +547,9 @@ static void *open_connection (void *arg) status = getgrnam_r (sock_group, &sg, grbuf, sizeof (grbuf), &grp); if (status != 0) { - log_warn ("getgrnam_r (%s) failed: %s", sock_group, strerror (status)); + char errbuf[1024]; + log_warn ("getgrnam_r (%s) failed: %s", sock_group, + sstrerror (errno, errbuf, sizeof (errbuf))); } else if (grp == NULL) { @@ -574,10 +557,14 @@ static void *open_connection (void *arg) } else { - status = chown (SOCK_PATH, (uid_t) -1, grp->gr_gid); + status = chown (sock_file, (uid_t) -1, grp->gr_gid); if (status != 0) + { + char errbuf[1024]; log_warn ("chown (%s, -1, %i) failed: %s", - SOCK_PATH, (int) grp->gr_gid, strerror (errno)); + sock_file, (int) grp->gr_gid, + sstrerror (errno, errbuf, sizeof (errbuf))); + } } } else /* geteuid != 0 */ @@ -586,8 +573,10 @@ static void *open_connection (void *arg) } errno = 0; - if (0 != chmod (SOCK_PATH, sock_perms)) { - log_warn ("chmod() failed: %s", strerror (errno)); + if (0 != chmod (sock_file, sock_perms)) { + char errbuf[1024]; + log_warn ("chmod() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); } { /* initialize collector threads */ @@ -609,11 +598,14 @@ static void *open_connection (void *arg) for (i = 0; i < max_conns; ++i) { collectors[i] = (collector_t *)smalloc (sizeof (collector_t)); - collectors[i]->socket = 0; + collectors[i]->socket = -1; if (0 != (err = pthread_create (&collectors[i]->thread, &ptattr, collect, collectors[i]))) { - log_err ("pthread_create() failed: %s", strerror (err)); + char errbuf[1024]; + log_err ("pthread_create() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + collectors[i]->thread = (pthread_t) 0; } } @@ -639,8 +631,11 @@ static void *open_connection (void *arg) errno = 0; if (-1 == (remote = accept (connector_socket, NULL, NULL))) { if (EINTR != errno) { + char errbuf[1024]; disabled = 1; - log_err ("accept() failed: %s", strerror (errno)); + connector_socket = -1; /* TODO: close? */ + log_err ("accept() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); pthread_exit ((void *)1); } } @@ -675,8 +670,10 @@ static int email_init (void) if (0 != (err = pthread_create (&connector, NULL, open_connection, NULL))) { + char errbuf[1024]; disabled = 1; - log_err ("pthread_create() failed: %s", strerror (err)); + log_err ("pthread_create() failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); return (-1); } @@ -687,23 +684,40 @@ static int email_shutdown (void) { int i = 0; - if (disabled) - return (0); + if (connector != ((pthread_t) 0)) { + pthread_kill (connector, SIGTERM); + connector = (pthread_t) 0; + } - pthread_kill (connector, SIGTERM); - close (connector_socket); + if (connector_socket >= 0) { + close (connector_socket); + connector_socket = -1; + } /* don't allow any more connections to be processed */ pthread_mutex_lock (&conns_mutex); - for (i = 0; i < max_conns; ++i) { - pthread_kill (collectors[i]->thread, SIGTERM); - close (collectors[i]->socket); - } + if (collectors != NULL) { + for (i = 0; i < max_conns; ++i) { + if (collectors[i] == NULL) + continue; + + if (collectors[i]->thread != ((pthread_t) 0)) { + pthread_kill (collectors[i]->thread, SIGTERM); + collectors[i]->thread = (pthread_t) 0; + } + + if (collectors[i]->socket >= 0) { + close (collectors[i]->socket); + collectors[i]->socket = -1; + } + } + } /* if (collectors != NULL) */ pthread_mutex_unlock (&conns_mutex); - unlink (SOCK_PATH); + unlink (sock_file); + errno = 0; return (0); } /* static void email_shutdown (void) */ @@ -718,8 +732,8 @@ 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"); + 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)); plugin_dispatch_values (type, &vl); @@ -767,7 +781,8 @@ static int email_read (void) { type_t *ptr; - double sc; + double score_old; + int score_count_old; static type_list_t *cnt; static type_list_t *sz; @@ -816,13 +831,15 @@ static int email_read (void) /* spam score */ pthread_mutex_lock (&score_mutex); - sc = score; + score_old = score; + score_count_old = score_count; score = 0.0; score_count = 0; pthread_mutex_unlock (&score_mutex); - email_submit ("spam_score", "", sc); + if (score_count_old > 0) + email_submit ("spam_score", "", score_old); /* spam checks */ pthread_mutex_lock (&check_mutex); @@ -839,16 +856,10 @@ static int email_read (void) void module_register (void) { - plugin_register_data_set (&email_count_ds); - plugin_register_data_set (&email_size_ds); - plugin_register_data_set (&spam_check_ds); - plugin_register_data_set (&spam_score_ds); - plugin_register_config ("email", email_config, config_keys, config_keys_num); plugin_register_init ("email", email_init); plugin_register_read ("email", email_read); plugin_register_shutdown ("email", email_shutdown); -} /* void module_register (void) */ +} /* void module_register */ /* vim: set sw=4 ts=4 tw=78 noexpandtab : */ -