diff --git a/src/email.c b/src/email.c
index e208f13049f168cbc08775366d5e01f7523c1982..5870ab1de1498593d4636973a65444d4e918d558 100644 (file)
--- a/src/email.c
+++ b/src/email.c
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 {
}
} /* 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);
} /* 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;
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)
@@ -650,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));