From 4d89874af6a798744a32deb314001a13a28f0559 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sat, 14 Dec 2013 11:54:26 -0500 Subject: logging: reduce send timeout to something more sensible For a user, the timeout of 1 min per message seems equivalent to a hang. If journald cannot process a message from PID1 for 10 ms then something is significantly wrong. It's better to lose the message and continue. --- src/shared/log.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/shared/log.c') diff --git a/src/shared/log.c b/src/shared/log.c index b5b82f61c1..268f0340a1 100644 --- a/src/shared/log.c +++ b/src/shared/log.c @@ -126,7 +126,10 @@ static int create_log_socket(int type) { /* We need a blocking fd here since we'd otherwise lose messages way too early. However, let's not hang forever in the unlikely case of a deadlock. */ - timeval_store(&tv, 1*USEC_PER_MINUTE); + if (getpid() == 1) + timeval_store(&tv, 10 * USEC_PER_MSEC); + else + timeval_store(&tv, 10 * USEC_PER_SEC); setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)); return fd; -- cgit v1.2.3-54-g00ecf