mirror of
https://github.com/haproxy/haproxy.git
synced 2026-03-21 18:10:47 -04:00
BUG/MINOR: sock: adjust accept() error messages for ENFILE and ENOMEM
In the ENFILE and ENOMEM cases, when accept() fails, an irrelevant global.maxsock value was printed that doesn't reflect system limits. Now the actconn is printed that gives a hint about the failure reasons. Should be backported in all stable branches.
This commit is contained in:
parent
5617e47f91
commit
60c9e2975b
1 changed files with 4 additions and 4 deletions
|
|
@ -162,8 +162,8 @@ struct connection *sock_accept_conn(struct listener *l, int *status)
|
|||
case ENFILE:
|
||||
if (p)
|
||||
send_log(p, LOG_EMERG,
|
||||
"Proxy %s reached system FD limit (maxsock=%d). Please check system tunables.\n",
|
||||
p->id, global.maxsock);
|
||||
"Proxy %s reached system FD limit (actconn=%d). Please check system tunables.\n",
|
||||
p->id, actconn);
|
||||
ret = CO_AC_PAUSE;
|
||||
break;
|
||||
|
||||
|
|
@ -179,8 +179,8 @@ struct connection *sock_accept_conn(struct listener *l, int *status)
|
|||
case ENOMEM:
|
||||
if (p)
|
||||
send_log(p, LOG_EMERG,
|
||||
"Proxy %s reached system memory limit (maxsock=%d). Please check system tunables.\n",
|
||||
p->id, global.maxsock);
|
||||
"Proxy %s reached system memory limit (actconn=%d). Please check system tunables.\n",
|
||||
p->id, actconn);
|
||||
ret = CO_AC_PAUSE;
|
||||
break;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue