diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-09-11 19:58:54 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-09-12 14:15:19 +0200 |
| commit | da310c6b45aa6ac360d2fc336eb164e401c08a86 (patch) | |
| tree | d23f5a6f861c1572610ac36bdcb90f858fbbe44e | |
| parent | ab6fcd913593d8ac4ad997e3dab1e1571a03a8bb (diff) | |
| download | systemd-da310c6b45aa6ac360d2fc336eb164e401c08a86.tar.gz | |
socket: downgrade log warnings about inability to set socket buffer sizes
In containers we might lack the privs to up the socket buffers. Let's
not complain so loudly about that. Let's hence downgrade this to debug
logging if it's a permission problem.
(This wasn't an issue before b92f350789e33942be0cf85af22a580c1fd483d6
because back then the failures wouldn't be detected at all.)
(cherry picked from commit 35b4e3c1bc7d4001244ff3986c084152c8901d03)
| -rw-r--r-- | src/core/socket.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 33e6013b03..809cac68a9 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1075,13 +1075,15 @@ static void socket_apply_socket_options(Socket *s, int fd) { if (s->receive_buffer > 0) { r = fd_set_rcvbuf(fd, s->receive_buffer, false); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "SO_RCVBUF/SO_RCVBUFFORCE failed: %m"); + log_unit_full_errno(UNIT(s), ERRNO_IS_PRIVILEGE(r) ? LOG_DEBUG : LOG_WARNING, r, + "SO_RCVBUF/SO_RCVBUFFORCE failed: %m"); } if (s->send_buffer > 0) { r = fd_set_sndbuf(fd, s->send_buffer, false); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "SO_SNDBUF/SO_SNDBUFFORCE failed: %m"); + log_unit_full_errno(UNIT(s), ERRNO_IS_PRIVILEGE(r) ? LOG_DEBUG : LOG_WARNING, r, + "SO_SNDBUF/SO_SNDBUFFORCE failed: %m"); } if (s->mark >= 0) { |