RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-15 07:54:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: sock_unix: report the errno string in binding errors

Browse Source 
Just like with previous patch, let's report UNIX socket binding errors
in plain text. we can now see for example:

  [ALERT] 260/083531 (13365) : Starting frontend f: cannot switch final and temporary UNIX sockets (Operation not permitted) [/tmp/root.sock]
  [ALERT] 260/083640 (13375) : Starting frontend f: cannot change UNIX socket ownership (Operation not permitted) [/tmp/root.sock]
This commit is contained in:
Willy Tarreau 2020-09-17 08:35:38 +02:00
parent 36722d2274
commit 3cd58bf805
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sock_unix.c
View File

@ -178,20 +178,20 @@ int sock_unix_bind_receiver(struct receiver *rx, void (*handler)(int fd), char *
/* 2. clean existing orphaned entries */
if (unlink(tempname) < 0 && errno != ENOENT) {
err |= ERR_FATAL | ERR_ALERT;
memprintf(errmsg, "error when trying to unlink previous UNIX socket");
memprintf(errmsg, "error when trying to unlink previous UNIX socket (%s)", strerror(errno));
goto bind_return;
}
if (unlink(backname) < 0 && errno != ENOENT) {
err |= ERR_FATAL | ERR_ALERT;
memprintf(errmsg, "error when trying to unlink previous UNIX socket");
memprintf(errmsg, "error when trying to unlink previous UNIX socket (%s)", strerror(errno));
goto bind_return;
}
/* 3. backup existing socket */
if (link(path, backname) < 0 && errno != ENOENT) {
err |= ERR_FATAL | ERR_ALERT;
memprintf(errmsg, "error when trying to preserve previous UNIX socket");
memprintf(errmsg, "error when trying to preserve previous UNIX socket (%s)", strerror(errno));
goto bind_return;
}
@ -222,7 +222,7 @@ int sock_unix_bind_receiver(struct receiver *rx, void (*handler)(int fd), char *
fd = socket(rx->proto->fam->sock_domain, rx->proto->sock_type, rx->proto->sock_prot);
if (fd < 0) {
err |= ERR_FATAL | ERR_ALERT;
memprintf(errmsg, "cannot create receiving socket");
memprintf(errmsg, "cannot create receiving socket (%s)", strerror(errno));
goto bind_return;
}
@ -249,7 +249,7 @@ int sock_unix_bind_receiver(struct receiver *rx, void (*handler)(int fd), char *
}
else {
err |= ERR_FATAL | ERR_ALERT;
memprintf(errmsg, "cannot bind UNIX socket");
memprintf(errmsg, "cannot bind UNIX socket (%s)", strerror(errno));
goto bind_close_return;
}
goto err_unlink_temp;
@ -265,7 +265,7 @@ int sock_unix_bind_receiver(struct receiver *rx, void (*handler)(int fd), char *
(chown(tempname, rx->settings->ux.uid, rx->settings->ux.gid) == -1)) ||
(rx->settings->ux.mode != 0 && chmod(tempname, rx->settings->ux.mode) == -1))) {
err |= ERR_FATAL | ERR_ALERT;
memprintf(errmsg, "cannot change UNIX socket ownership");
memprintf(errmsg, "cannot change UNIX socket ownership (%s)", strerror(errno));
goto err_unlink_temp;
}
@ -275,7 +275,7 @@ int sock_unix_bind_receiver(struct receiver *rx, void (*handler)(int fd), char *
*/
if (!ext && path[0] && rename(tempname, path) < 0) {
err |= ERR_FATAL | ERR_ALERT;
memprintf(errmsg, "cannot switch final and temporary UNIX sockets");
memprintf(errmsg, "cannot switch final and temporary UNIX sockets (%s)", strerror(errno));
goto err_rename;
}