/**
* collectd - src/email.c
- * Copyright (C) 2006 Sebastian Harl
+ * Copyright (C) 2006-2008 Sebastian Harl
*
* 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
#include "configfile.h"
+#include <stddef.h>
+
#if HAVE_LIBPTHREAD
# include <pthread.h>
-# define EMAIL_HAVE_READ 1
-#else
-# define EMAIL_HAVE_READ 0
#endif
-#if HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif /* HAVE_SYS_SELECT_H */
-
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif /* HAVE_SYS_SOCKET_H */
-
-/* *sigh* glibc does not define UNIX_PATH_MAX in sys/un.h ... */
-#if HAVE_LINUX_UN_H
-# include <linux/un.h>
-#elif HAVE_SYS_UN_H
-# include <sys/un.h>
-#endif /* HAVE_LINUX_UN_H | HAVE_SYS_UN_H */
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/select.h>
/* some systems (e.g. Darwin) seem to not define UNIX_PATH_MAX at all */
#ifndef UNIX_PATH_MAX
# include <grp.h>
#endif /* HAVE_GRP_H */
-#define MODULE_NAME "email"
-
-/* 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_debug(...) DEBUG ("email: "__VA_ARGS__)
+#define log_err(...) ERROR ("email: "__VA_ARGS__)
+#define log_warn(...) WARNING ("email: "__VA_ARGS__)
/*
* Private data structures
*/
-#if EMAIL_HAVE_READ
/* linked list of email and check types */
typedef struct type {
char *name;
pthread_t thread;
/* socket descriptor of the current/last connection */
- int socket;
+ FILE *socket;
} collector_t;
/* linked list of pending connections */
typedef struct conn {
/* socket to read data from */
- int socket;
-
- /* buffer to read data to */
- char *buffer;
- int idx; /* current write position in buffer */
- int length; /* length of the current line, i.e. index of '\0' */
+ FILE *socket;
+ /* linked list of connections */
struct conn *next;
} conn_t;
conn_t *head;
conn_t *tail;
} conn_list_t;
-#endif /* EMAIL_HAVE_READ */
/*
* Private variables
*/
-#if EMAIL_HAVE_READ
/* valid configuration file keys */
-static char *config_keys[] =
+static const char *config_keys[] =
{
+ "SocketFile",
"SocketGroup",
"SocketPerms",
- "MaxConns",
- NULL
+ "MaxConns"
};
-static int config_keys_num = 3;
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
/* socket configuration */
-static char *sock_group = COLLECTD_GRP_NAME;
+static char *sock_file = NULL;
+static char *sock_group = NULL;
static int sock_perms = S_IRWXU | S_IRWXG;
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;
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;
static pthread_mutex_t count_mutex = PTHREAD_MUTEX_INITIALIZER;
-static type_list_t count;
+static type_list_t list_count;
+static type_list_t list_count_copy;
static pthread_mutex_t size_mutex = PTHREAD_MUTEX_INITIALIZER;
-static type_list_t size;
+static type_list_t list_size;
+static type_list_t list_size_copy;
static pthread_mutex_t score_mutex = PTHREAD_MUTEX_INITIALIZER;
static double score;
static int score_count;
static pthread_mutex_t check_mutex = PTHREAD_MUTEX_INITIALIZER;
-static type_list_t check;
-#endif /* EMAIL_HAVE_READ */
-
-#define COUNT_FILE "email/email-%s.rrd"
-static char *count_ds_def[] =
-{
- "DS:count:GAUGE:"COLLECTD_HEARTBEAT":0:U",
- NULL
-};
-static int count_ds_num = 1;
-
-#define SIZE_FILE "email/email_size-%s.rrd"
-static char *size_ds_def[] =
-{
- "DS:size:GAUGE:"COLLECTD_HEARTBEAT":0:U",
- NULL
-};
-static int size_ds_num = 1;
-
-#define SCORE_FILE "email/spam_score.rrd"
-static char *score_ds_def[] =
-{
- "DS:score:GAUGE:"COLLECTD_HEARTBEAT":U:U",
- NULL
-};
-static int score_ds_num = 1;
-
-#define CHECK_FILE "email/spam_check-%s.rrd"
-static char *check_ds_def[] =
-{
- "DS:hits:GAUGE:"COLLECTD_HEARTBEAT":0:U",
- NULL
-};
-static int check_ds_num = 1;
+static type_list_t list_check;
+static type_list_t list_check_copy;
-#if EMAIL_HAVE_READ
-static int email_config (char *key, char *value)
+/*
+ * Private functions
+ */
+static int email_config (const char *key, const char *value)
{
- if (0 == strcasecmp (key, "SocketGroup")) {
+ if (0 == strcasecmp (key, "SocketFile")) {
+ if (NULL != sock_file)
+ free (sock_file);
+ sock_file = sstrdup (value);
+ }
+ else if (0 == strcasecmp (key, "SocketGroup")) {
+ if (NULL != sock_group)
+ free (sock_group);
sock_group = sstrdup (value);
}
else if (0 == strcasecmp (key, "SocketPerms")) {
return;
} /* static void type_list_incr (type_list_t *, char *) */
-/* Read a single character from the socket. If an error occurs or end-of-file
- * is reached return '\0'. */
-static char read_char (conn_t *src)
-{
- char ret = '\0';
-
- fd_set fdset;
-
- FD_ZERO (&fdset);
- FD_SET (src->socket, &fdset);
-
- if (-1 == select (src->socket + 1, &fdset, NULL, NULL, NULL)) {
- log_err ("select() failed: %s", strerror (errno));
- return '\0';
- }
-
- assert (FD_ISSET (src->socket, &fdset));
-
- do {
- ssize_t len = 0;
-
- errno = 0;
- if (0 > (len = read (src->socket, (void *)&ret, 1))) {
- if (EINTR != errno) {
- log_err ("read() failed: %s", strerror (errno));
- return '\0';
- }
- }
-
- if (0 == len)
- return '\0';
- } while (EINTR == errno);
- return ret;
-} /* static char read_char (conn_t *) */
-
-/* Read a single line (terminated by '\n') from the the socket.
- *
- * The return value is zero terminated and does not contain any newline
- * characters.
- *
- * If an error occurs or end-of-file is reached return NULL.
- *
- * IMPORTANT NOTE: If there is no newline character found in BUFSIZE
- * characters of the input stream, the line will will be ignored! By
- * definition we should not get any longer input lines, thus this is
- * acceptable in this case ;-) */
-static char *read_line (conn_t *src)
-{
- int i = 0;
-
- assert ((BUFSIZE >= src->idx) && (src->idx >= 0));
- assert ((src->idx > src->length) || (src->length == 0));
-
- if (src->length > 0) { /* remove old line */
- src->idx -= (src->length + 1);
- memmove (src->buffer, src->buffer + src->length + 1, src->idx);
- src->length = 0;
- }
-
- for (i = 0; i < src->idx; ++i) {
- if ('\n' == src->buffer[i])
- break;
- }
-
- if (i == src->idx) {
- fd_set fdset;
-
- ssize_t len = 0;
-
- FD_ZERO (&fdset);
- FD_SET (src->socket, &fdset);
-
- if (-1 == select (src->socket + 1, &fdset, NULL, NULL, NULL)) {
- log_err ("select() failed: %s", strerror (errno));
- return NULL;
- }
-
- assert (FD_ISSET (src->socket, &fdset));
-
- do {
- errno = 0;
- if (0 > (len = read (src->socket,
- (void *)(src->buffer + src->idx),
- BUFSIZE - src->idx))) {
- if (EINTR != errno) {
- log_err ("read() failed: %s", strerror (errno));
- return NULL;
- }
- }
-
- if (0 == len)
- return NULL;
- } while (EINTR == errno);
-
- src->idx += len;
-
- for (i = src->idx - len; i < src->idx; ++i) {
- if ('\n' == src->buffer[i])
- break;
- }
-
- if (i == src->idx) {
- src->length = 0;
-
- if (BUFSIZE == src->idx) { /* no space left in buffer */
- while ('\n' != read_char (src))
- /* ignore complete line */;
-
- src->idx = 0;
- }
- return read_line (src);
- }
- }
-
- src->buffer[i] = '\0';
- src->length = i;
-
- return src->buffer;
-} /* static char *read_line (conn_t *) */
-
static void *collect (void *arg)
{
collector_t *this = (collector_t *)arg;
-
- char *buffer = (char *)smalloc (BUFSIZE);
+ pthread_t self = pthread_self ();
while (1) {
int loop = 1;
conns.tail = NULL;
}
- this->socket = connection->socket;
-
pthread_mutex_unlock (&conns_mutex);
- connection->buffer = buffer;
- connection->idx = 0;
- connection->length = 0;
+ /* make the socket available to the global
+ * thread and connection management */
+ this->socket = connection->socket;
- { /* put the socket in non-blocking mode */
- int flags = 0;
+ log_debug ("[thread #%5lu] handling connection on fd #%i",
+ self, fileno (this->socket));
- errno = 0;
- if (-1 == fcntl (connection->socket, F_GETFL, &flags)) {
- log_err ("fcntl() failed: %s", strerror (errno));
- loop = 0;
- }
+ while (loop) {
+ /* 256 bytes ought to be enough for anybody ;-) */
+ char line[256 + 1]; /* line + '\0' */
+ int len = 0;
errno = 0;
- if (-1 == fcntl (connection->socket, F_SETFL, flags | O_NONBLOCK)) {
- log_err ("fcntl() failed: %s", strerror (errno));
+ if (NULL == fgets (line, sizeof (line), this->socket)) {
loop = 0;
+
+ if (0 != errno) {
+ char errbuf[1024];
+ log_err ("[thread #%5lu] reading from socket (fd #%i) "
+ "failed: %s", self, fileno (this->socket),
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ }
+ break;
}
- }
- while (loop) {
- char *line = read_line (connection);
+ len = strlen (line);
+ if (('\n' != line[len - 1]) && ('\r' != line[len - 1])) {
+ log_warn ("[thread #%5lu] line too long (> %i characters): "
+ "'%s' (truncated)", self, sizeof (line) - 1, line);
- if (NULL == line) {
- loop = 0;
- break;
+ while (NULL != fgets (line, sizeof (line), this->socket))
+ if (('\n' == line[len - 1]) || ('\r' == line[len - 1]))
+ break;
+ continue;
}
+ line[len - 1] = '\0';
+
+ log_debug ("[thread #%5lu] line = '%s'", self, line);
+
if (':' != line[1]) {
- log_err ("syntax error in line '%s'", line);
+ log_err ("[thread #%5lu] syntax error in line '%s'",
+ self, line);
continue;
}
int bytes = 0;
if (NULL == tmp) {
- log_err ("syntax error in line '%s'", line);
+ log_err ("[thread #%5lu] syntax error in line '%s'",
+ self, line);
continue;
}
bytes = atoi (tmp);
pthread_mutex_lock (&count_mutex);
- type_list_incr (&count, type, 1);
+ type_list_incr (&list_count, type, 1);
pthread_mutex_unlock (&count_mutex);
- pthread_mutex_lock (&size_mutex);
- type_list_incr (&size, type, bytes);
- pthread_mutex_unlock (&size_mutex);
+ if (bytes > 0) {
+ pthread_mutex_lock (&size_mutex);
+ type_list_incr (&list_size, type, bytes);
+ pthread_mutex_unlock (&size_mutex);
+ }
}
else if ('s' == line[0]) { /* s:<value> */
pthread_mutex_lock (&score_mutex);
do {
pthread_mutex_lock (&check_mutex);
- type_list_incr (&check, type, 1);
+ type_list_incr (&list_check, type, 1);
pthread_mutex_unlock (&check_mutex);
} while (NULL != (type = strtok_r (NULL, ",", &ptr)));
}
else {
- log_err ("unknown type '%c'", line[0]);
+ log_err ("[thread #%5lu] unknown type '%c'", self, line[0]);
}
} /* while (loop) */
- close (connection->socket);
+ log_debug ("[thread #%5lu] shutting down connection on fd #%i",
+ pthread_self (), fileno (this->socket));
+ fclose (connection->socket);
free (connection);
+ this->socket = NULL;
+
pthread_mutex_lock (&available_mutex);
++available_collectors;
pthread_mutex_unlock (&available_mutex);
pthread_cond_signal (&collector_available);
} /* while (1) */
- free (buffer);
pthread_exit ((void *)0);
} /* static void *collect (void *) */
{
struct sockaddr_un addr;
+ char *path = (NULL == sock_file) ? SOCK_PATH : sock_file;
+ char *group = (NULL == sock_group) ? COLLECTD_GRP_NAME : sock_group;
+
/* 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, path, (size_t)(UNIX_PATH_MAX - 1));
addr.sun_path[UNIX_PATH_MAX - 1] = '\0';
unlink (addr.sun_path);
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));
+ close (connector_socket);
+ connector_socket = -1;
+ 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));
+ close (connector_socket);
+ connector_socket = -1;
+ log_err ("listen() failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
pthread_exit ((void *)1);
}
- if ((uid_t)0 == geteuid ()) {
+ {
+ struct group sg;
struct group *grp;
-
- errno = 0;
- if (NULL != (grp = getgrnam (sock_group))) {
- errno = 0;
- if (0 != chown (SOCK_PATH, (uid_t)-1, grp->gr_gid)) {
- log_warn ("chown() failed: %s", strerror (errno));
- }
+ char grbuf[2048];
+ int status;
+
+ grp = NULL;
+ status = getgrnam_r (group, &sg, grbuf, sizeof (grbuf), &grp);
+ if (status != 0)
+ {
+ char errbuf[1024];
+ log_warn ("getgrnam_r (%s) failed: %s", group,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
}
- else {
- log_warn ("getgrnam() failed: %s", strerror (errno));
+ else if (grp == NULL)
+ {
+ log_warn ("No such group: `%s'", group);
+ }
+ else
+ {
+ status = chown (path, (uid_t) -1, grp->gr_gid);
+ if (status != 0)
+ {
+ char errbuf[1024];
+ log_warn ("chown (%s, -1, %i) failed: %s",
+ path, (int) grp->gr_gid,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ }
}
- }
- else {
- log_warn ("not running as root");
}
errno = 0;
- if (0 != chmod (SOCK_PATH, sock_perms)) {
- log_warn ("chmod() failed: %s", strerror (errno));
+ if (0 != chmod (path, sock_perms)) {
+ char errbuf[1024];
+ log_warn ("chmod() failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
}
{ /* initialize collector threads */
for (i = 0; i < max_conns; ++i) {
collectors[i] = (collector_t *)smalloc (sizeof (collector_t));
- collectors[i]->socket = 0;
+ collectors[i]->socket = NULL;
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;
}
}
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));
+ close (connector_socket);
+ connector_socket = -1;
+ log_err ("accept() failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
pthread_exit ((void *)1);
}
}
connection = (conn_t *)smalloc (sizeof (conn_t));
- connection->socket = remote;
+ connection->socket = fdopen (remote, "r");
connection->next = NULL;
+ if (NULL == connection->socket) {
+ close (remote);
+ continue;
+ }
+
pthread_mutex_lock (&conns_mutex);
if (NULL == conns.head) {
}
pthread_exit ((void *)0);
} /* static void *open_connection (void *) */
-#endif /* EMAIL_HAVE_READ */
-static void email_init (void)
+static int email_init (void)
{
-#if EMAIL_HAVE_READ
int err = 0;
if (0 != (err = pthread_create (&connector, NULL,
open_connection, NULL))) {
+ char errbuf[1024];
disabled = 1;
- log_err ("pthread_create() failed: %s", strerror (err));
- return;
+ log_err ("pthread_create() failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ return (-1);
}
-#endif /* EMAIL_HAVE_READ */
- return;
-} /* static void email_init (void) */
-#if EMAIL_HAVE_READ
-static void email_shutdown (void)
+ return (0);
+} /* int email_init */
+
+static int email_shutdown (void)
{
+ type_t *ptr = NULL;
+
int i = 0;
- if (disabled)
- return;
+ 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);
- }
-
- pthread_mutex_unlock (&conns_mutex);
-
- unlink (SOCK_PATH);
- return;
-} /* static void email_shutdown (void) */
-#endif /* EMAIL_HAVE_READ */
+ available_collectors = 0;
-static void count_write (char *host, char *inst, char *val)
-{
- char file[BUFSIZE] = "";
- int len = 0;
+ if (collectors != NULL) {
+ for (i = 0; i < max_conns; ++i) {
+ if (collectors[i] == NULL)
+ continue;
- len = snprintf (file, BUFSIZE, COUNT_FILE, inst);
- if ((len < 0) || (len >= BUFSIZE))
- return;
+ if (collectors[i]->thread != ((pthread_t) 0)) {
+ pthread_kill (collectors[i]->thread, SIGTERM);
+ collectors[i]->thread = (pthread_t) 0;
+ }
- rrd_update_file (host, file, val, count_ds_def, count_ds_num);
- return;
-} /* static void email_write (char *host, char *inst, char *val) */
+ if (collectors[i]->socket != NULL) {
+ fclose (collectors[i]->socket);
+ collectors[i]->socket = NULL;
+ }
-static void size_write (char *host, char *inst, char *val)
-{
- char file[BUFSIZE] = "";
- int len = 0;
+ sfree (collectors[i]);
+ }
+ sfree (collectors);
+ } /* if (collectors != NULL) */
- len = snprintf (file, BUFSIZE, SIZE_FILE, inst);
- if ((len < 0) || (len >= BUFSIZE))
- return;
+ pthread_mutex_unlock (&conns_mutex);
- rrd_update_file (host, file, val, size_ds_def, size_ds_num);
- return;
-} /* static void size_write (char *host, char *inst, char *val) */
+ for (ptr = list_count.head; NULL != ptr; ptr = ptr->next) {
+ free (ptr->name);
+ free (ptr);
+ }
-static void score_write (char *host, char *inst, char *val)
-{
- rrd_update_file (host, SCORE_FILE, val, score_ds_def, score_ds_num);
- return;
-} /* static void score_write (char *host, char *inst, char *val) */
+ for (ptr = list_count_copy.head; NULL != ptr; ptr = ptr->next) {
+ free (ptr->name);
+ free (ptr);
+ }
-static void check_write (char *host, char *inst, char *val)
-{
- char file[BUFSIZE] = "";
- int len = 0;
+ for (ptr = list_size.head; NULL != ptr; ptr = ptr->next) {
+ free (ptr->name);
+ free (ptr);
+ }
- len = snprintf (file, BUFSIZE, CHECK_FILE, inst);
- if ((len < 0) || (len >= BUFSIZE))
- return;
+ for (ptr = list_size_copy.head; NULL != ptr; ptr = ptr->next) {
+ free (ptr->name);
+ free (ptr);
+ }
- rrd_update_file (host, file, val, check_ds_def, check_ds_num);
- return;
-} /* static void check_write (char *host, char *inst, char *val) */
+ for (ptr = list_check.head; NULL != ptr; ptr = ptr->next) {
+ free (ptr->name);
+ free (ptr);
+ }
-#if EMAIL_HAVE_READ
-static void type_submit (char *plugin, char *inst, int value)
-{
- char buf[BUFSIZE] = "";
- int len = 0;
+ for (ptr = list_check_copy.head; NULL != ptr; ptr = ptr->next) {
+ free (ptr->name);
+ free (ptr);
+ }
- len = snprintf (buf, BUFSIZE, "%u:%i", (unsigned int)curtime, value);
- if ((len < 0) || (len >= BUFSIZE))
- return;
+ unlink ((NULL == sock_file) ? SOCK_PATH : sock_file);
- plugin_submit (plugin, inst, buf);
- return;
-} /* static void type_submit (char *, char *, int) */
+ sfree (sock_file);
+ sfree (sock_group);
+ return (0);
+} /* static void email_shutdown (void) */
-static void score_submit (double value)
+static void email_submit (const char *type, const char *type_instance, gauge_t value)
{
- char buf[BUFSIZE] = "";
- int len = 0;
+ value_t values[1];
+ value_list_t vl = VALUE_LIST_INIT;
- len = snprintf (buf, BUFSIZE, "%u:%.2f", (unsigned int)curtime, value);
- if ((len < 0) || (len >= BUFSIZE))
- return;
+ values[0].gauge = value;
- plugin_submit ("email_spam_score", NULL, buf);
- return;
-} /* static void score_submit (double) */
+ 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));
+
+ plugin_dispatch_values (type, &vl);
+} /* void email_submit */
/* Copy list l1 to list l2. l2 may partly exist already, but it is assumed
* that neither the order nor the name of any element of either list is
return;
}
-static void email_read (void)
+static int email_read (void)
{
type_t *ptr;
- double sc;
-
- static type_list_t *cnt;
- static type_list_t *sz;
- static type_list_t *chk;
+ double score_old;
+ int score_count_old;
if (disabled)
- return;
-
- if (NULL == cnt) {
- cnt = (type_list_t *)smalloc (sizeof (type_list_t));
- cnt->head = NULL;
- }
-
- if (NULL == sz) {
- sz = (type_list_t *)smalloc (sizeof (type_list_t));
- sz->head = NULL;
- }
-
- if (NULL == chk) {
- chk = (type_list_t *)smalloc (sizeof (type_list_t));
- chk->head = NULL;
- }
+ return (-1);
/* email count */
pthread_mutex_lock (&count_mutex);
- copy_type_list (&count, cnt);
+ copy_type_list (&list_count, &list_count_copy);
pthread_mutex_unlock (&count_mutex);
- for (ptr = cnt->head; NULL != ptr; ptr = ptr->next) {
- type_submit ("email_count", ptr->name, ptr->value);
+ for (ptr = list_count_copy.head; NULL != ptr; ptr = ptr->next) {
+ email_submit ("email_count", ptr->name, ptr->value);
}
/* email size */
pthread_mutex_lock (&size_mutex);
- copy_type_list (&size, sz);
+ copy_type_list (&list_size, &list_size_copy);
pthread_mutex_unlock (&size_mutex);
- for (ptr = sz->head; NULL != ptr; ptr = ptr->next) {
- type_submit ("email_size", ptr->name, ptr->value);
+ for (ptr = list_size_copy.head; NULL != ptr; ptr = ptr->next) {
+ email_submit ("email_size", ptr->name, ptr->value);
}
/* 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);
- score_submit (sc);
+ if (score_count_old > 0)
+ email_submit ("spam_score", "", score_old);
/* spam checks */
pthread_mutex_lock (&check_mutex);
- copy_type_list (&check, chk);
+ copy_type_list (&list_check, &list_check_copy);
pthread_mutex_unlock (&check_mutex);
- for (ptr = chk->head; NULL != ptr; ptr = ptr->next) {
- type_submit ("email_spam_check", ptr->name, ptr->value);
- }
- return;
-} /* static void read (void) */
-#else /* if !EMAIL_HAVE_READ */
-# define email_read NULL
-#endif
+ for (ptr = list_check_copy.head; NULL != ptr; ptr = ptr->next)
+ email_submit ("spam_check", ptr->name, ptr->value);
+
+ return (0);
+} /* int email_read */
void module_register (void)
{
- plugin_register (MODULE_NAME, email_init, email_read, NULL);
- plugin_register ("email_count", NULL, NULL, count_write);
- plugin_register ("email_size", NULL, NULL, size_write);
- plugin_register ("email_spam_score", NULL, NULL, score_write);
- plugin_register ("email_spam_check", NULL, NULL, check_write);
-#if EMAIL_HAVE_READ
- plugin_register_shutdown (MODULE_NAME, email_shutdown);
- cf_register (MODULE_NAME, email_config, config_keys, config_keys_num);
-#endif /* EMAIL_HAVE_READ */
- return;
-} /* void module_register (void) */
+ 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 */
/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
-