emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslogd: Improve log messages on error, eg. INET sendto()

Browse Source 
When we fail sending to a remote host, help admin debug the issue by
stating which remote we failed to send to.

Also minor changes to other similar error messages, use same form.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson 2019-11-28 09:37:19 +01:00
parent 0e6c141f4f
commit 3d4b8cb84d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/syslogd.c
View File

@ -499,7 +499,7 @@ static void kernel_cb(int fd, void *arg)
line[i + len] = '\0'; line[i + len] = '\0';
} else { } else {
if (i < 0 && errno != EINTR && errno != EAGAIN) { if (i < 0 && errno != EINTR && errno != EAGAIN) {
ERR("klog"); ERR("klog read()");
socket_close(fd); socket_close(fd);
} }
break; break;
@ -547,7 +547,7 @@ static void unix_cb(int sd, void *arg)
logit("Message from UNIX socket #%d: %s\n", sd, msg); logit("Message from UNIX socket #%d: %s\n", sd, msg);
if (msglen <= 0) { if (msglen <= 0) {
if (msglen < 0 && errno != EINTR) if (msglen < 0 && errno != EINTR)
ERR("recv() UNIX"); ERR("UNIX recv()");
return; return;
} }
@ -617,7 +617,7 @@ static void inet_cb(int sd, void *arg)
len = recvfrom(sd, msg, sizeof(msg) - 1, 0, sa, &sslen); len = recvfrom(sd, msg, sizeof(msg) - 1, 0, sa, &sslen);
if (len <= 0) { if (len <= 0) {
if (len < 0 && errno != EINTR && errno != EAGAIN) if (len < 0 && errno != EINTR && errno != EAGAIN)
ERR("INET socket recvfrom()"); ERR("INET recvfrom()");
return; return;
} }
@ -1502,7 +1502,7 @@ void fprintlog_write(struct filed *f, struct iovec *iov, int iovcnt, int flags)
if (err != -1) { if (err != -1) {
f->f_type = F_FORW_SUSP; f->f_type = F_FORW_SUSP;
errno = err; errno = err;
ERR("INET sendto()"); ERR("INET sendto(%s:%s)", f->f_un.f_forw.f_hname, f->f_un.f_forw.f_serv);
} }
break; break;