thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

logger: allow to reconnect on initial failed connect too

Browse source 
The current code sets noact flag if unix socked connection failed. This is ugly.
We want to reconnect always in all cases (well, except --socket-error=on).

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-10-11 12:35:24 +02:00
parent 87ac63c9fa
commit e92d55e6cb
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
misc-utils/logger.c
View file

@ -139,6 +139,7 @@ struct logger_ctl {
octet_count:1; /* use RFC6587 octet counting */ octet_count:1; /* use RFC6587 octet counting */
}; };
#define is_connected(_ctl) ((_ctl)->fd >= 0)
static void logger_reopen(struct logger_ctl *ctl); static void logger_reopen(struct logger_ctl *ctl);
/* /*
@ -268,9 +269,7 @@ static int unix_socket(struct logger_ctl *ctl, const char *path, int *socket_typ
if (ctl->unix_socket_errors) if (ctl->unix_socket_errors)
err(EXIT_FAILURE, _("socket %s"), path); err(EXIT_FAILURE, _("socket %s"), path);
/* openlog(3) compatibility, socket errors are /* write_output() will try to reconnect */
* not reported, but ignored silently */
ctl->noact = 1;
return -1; return -1;
} }
@ -433,6 +432,10 @@ static void write_output(struct logger_ctl *ctl, const char *const msg)
int iovlen = 0; int iovlen = 0;
char *octet = NULL; char *octet = NULL;
/* initial connect failed? */
if (!ctl->noact && !is_connected(ctl))
logger_reopen(ctl);
/* 1) octen count */ /* 1) octen count */
if (ctl->octet_count) { if (ctl->octet_count) {
size_t len = xasprintf(&octet, "%zu ", strlen(ctl->hdr) + strlen(msg)); size_t len = xasprintf(&octet, "%zu ", strlen(ctl->hdr) + strlen(msg));
@ -445,7 +448,7 @@ static void write_output(struct logger_ctl *ctl, const char *const msg)
/* 3) message */ /* 3) message */
iovec_add_string(iov, iovlen, msg, 0); iovec_add_string(iov, iovlen, msg, 0);
if (!ctl->noact) { if (!ctl->noact && is_connected(ctl)) {
struct msghdr message = { 0 }; struct msghdr message = { 0 };
#ifdef SCM_CREDENTIALS #ifdef SCM_CREDENTIALS
struct cmsghdr *cmhp; struct cmsghdr *cmhp;