projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.3' into collectd-4.4
[collectd.git]
/
src
/
email.c
diff --git
a/src/email.c
b/src/email.c
index
ed10e34
..
0882ad4
100644
(file)
--- a/
src/email.c
+++ b/
src/email.c
@@
-243,7
+243,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;
static void *collect (void *arg)
{
collector_t *this = (collector_t *)arg;
- pthread_t self = pthread_self ();
while (1) {
int loop = 1;
while (1) {
int loop = 1;
@@
-269,8
+268,8
@@
static void *collect (void *arg)
* thread and connection management */
this->socket = connection->socket;
* 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 ;-) */
while (loop) {
/* 256 bytes ought to be enough for anybody ;-) */
@@
-283,8
+282,8
@@
static void *collect (void *arg)
if (0 != errno) {
char errbuf[1024];
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;
sstrerror (errno, errbuf, sizeof (errbuf)));
}
break;
@@
-292,8
+291,8
@@
static void *collect (void *arg)
len = strlen (line);
if (('\n' != line[len - 1]) && ('\r' != line[len - 1])) {
len = strlen (line);
if (('\n' != line[len - 1]) && ('\r' != line[len - 1])) {
- log_warn ("
[thread #%5lu] line too long (> %l
u characters): "
- "'%s' (truncated)", s
elf, s
izeof (line) - 1, line);
+ log_warn ("
collect: line too long (> %z
u characters): "
+ "'%s' (truncated)", sizeof (line) - 1, line);
while (NULL != fgets (line, sizeof (line), this->socket))
if (('\n' == line[len - 1]) || ('\r' == line[len - 1]))
while (NULL != fgets (line, sizeof (line), this->socket))
if (('\n' == line[len - 1]) || ('\r' == line[len - 1]))
@@
-303,11
+302,10
@@
static void *collect (void *arg)
line[len - 1] = '\0';
line[len - 1] = '\0';
- log_debug ("
[thread #%5lu] line = '%s'", self
, line);
+ log_debug ("
collect: line = '%s'"
, line);
if (':' != line[1]) {
if (':' != line[1]) {
- log_err ("[thread #%5lu] syntax error in line '%s'",
- self, line);
+ log_err ("collect: syntax error in line '%s'", line);
continue;
}
continue;
}
@@
-318,8
+316,7
@@
static void *collect (void *arg)
int bytes = 0;
if (NULL == tmp) {
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;
}
continue;
}
@@
-353,7
+350,7
@@
static void *collect (void *arg)
} while (NULL != (type = strtok_r (NULL, ",", &ptr)));
}
else {
} 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) */
}
} /* while (loop) */
@@
-396,7
+393,6
@@
static void *open_connection (void *arg)
strncpy (addr.sun_path, path, (size_t)(UNIX_PATH_MAX - 1));
addr.sun_path[UNIX_PATH_MAX - 1] = '\0';
strncpy (addr.sun_path, path, (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,
errno = 0;
if (-1 == bind (connector_socket, (struct sockaddr *)&addr,
@@
-657,8
+653,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);
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- s
trcpy (vl.host, hostname_g
);
- s
trcpy (vl.plugin, "email"
);
+ s
strncpy (vl.host, hostname_g, sizeof (vl.host)
);
+ s
strncpy (vl.plugin, "email", sizeof (vl.plugin)
);
strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
plugin_dispatch_values (type, &vl);
strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
plugin_dispatch_values (type, &vl);