RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-01 23:39:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: protocol: uniformize protocol errors

Browse Source 
Some protocols fail with "error blah [ip:port]" and other fail with
"[ip:port] error blah". All this already appears in a "starting" or
"binding" context after a proxy name. Let's choose a more universal
approach like below where the ip:port remains at the end of the line
prefixed with "for".

  [WARNING]  (18632) : Binding [binderr.cfg:10] for proxy http: cannot bind receiver to device 'eth2' (No such device) for [0.0.0.0:1080]
  [WARNING]  (18632) : Starting [binderr.cfg:10] for proxy http: cannot set MSS to 12 for [0.0.0.0:1080]
This commit is contained in:
Willy Tarreau 2021-10-14 11:59:15 +02:00
parent 37de553f1d
commit 6823a3acee
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto_quic.c
View File

@ -607,7 +607,7 @@ static int quic_bind_listener(struct listener *listener, char *errmsg, int errle
char pn[INET6_ADDRSTRLEN];
addr_to_str(&listener->rx.addr, pn, sizeof(pn));
snprintf(errmsg, errlen, "%s [%s:%d]", msg, pn, get_host_port(&listener->rx.addr));
snprintf(errmsg, errlen, "%s for [%s:%d]", msg, pn, get_host_port(&listener->rx.addr));
}
return err;
}

2
src/proto_sockpair.c
View File

@ -162,7 +162,7 @@ int sockpair_bind_receiver(struct receiver *rx, char **errmsg)
bind_return:
if (errmsg && *errmsg)
memprintf(errmsg, "%s [fd %d]", *errmsg, rx->fd);
memprintf(errmsg, "%s for [fd %d]", *errmsg, rx->fd);
return err;

2
src/proto_tcp.c
View File

@ -734,7 +734,7 @@ int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen)
char pn[INET6_ADDRSTRLEN];
addr_to_str(&listener->rx.addr, pn, sizeof(pn));
snprintf(errmsg, errlen, "[%s:%d]: %s", pn, get_host_port(&listener->rx.addr), msg->area);
snprintf(errmsg, errlen, "%s for [%s:%d]", msg->area, pn, get_host_port(&listener->rx.addr));
}
free_trash_chunk(msg);
msg = NULL;

2
src/proto_udp.c
View File

@ -148,7 +148,7 @@ int udp_bind_listener(struct listener *listener, char *errmsg, int errlen)
char pn[INET6_ADDRSTRLEN];
addr_to_str(&listener->rx.addr, pn, sizeof(pn));
snprintf(errmsg, errlen, "%s [%s:%d]", msg, pn, get_host_port(&listener->rx.addr));
snprintf(errmsg, errlen, "%s for [%s:%d]", msg, pn, get_host_port(&listener->rx.addr));
}
return err;
}

2
src/proto_uxdg.c
View File

@ -103,7 +103,7 @@ int uxdg_bind_listener(struct listener *listener, char *errmsg, int errlen)
uxdg_return:
if (msg && errlen) {
const char *path = ((struct sockaddr_un *)&listener->rx.addr)->sun_path;
snprintf(errmsg, errlen, "%s [%s]", msg, path);
snprintf(errmsg, errlen, "%s for [%s]", msg, path);
}
return err;
}

2
src/proto_uxst.c
View File

@ -141,7 +141,7 @@ static int uxst_bind_listener(struct listener *listener, char *errmsg, int errle
uxst_return:
if (msg && errlen) {
const char *path = ((struct sockaddr_un *)&listener->rx.addr)->sun_path;
snprintf(errmsg, errlen, "%s [%s]", msg, path);
snprintf(errmsg, errlen, "%s for [%s]", msg, path);
}
return err;
}

2
src/sock_inet.c
View File

@ -402,7 +402,7 @@ int sock_inet_bind_receiver(struct receiver *rx, char **errmsg)
char pn[INET6_ADDRSTRLEN];
addr_to_str(&addr_inet, pn, sizeof(pn));
memprintf(errmsg, "%s [%s:%d]", *errmsg, pn, get_host_port(&addr_inet));
memprintf(errmsg, "%s for [%s:%d]", *errmsg, pn, get_host_port(&addr_inet));
}
return err;