summaryrefslogtreecommitdiff
path: root/src/logger.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-04-14 02:32:42 +0200
committerLennart Poettering <lennart@poettering.net>2011-04-16 02:03:34 +0200
commitef9eb0a8976140654827d479af1f4256fae6afe3 (patch)
tree58bd61dac18d174264c6366ed5ad533a099efc20 /src/logger.c
parent7f434cf4c9a72c3291a8603a3e91dd66dde4d640 (diff)
logger,initctl: use global exit timeout
Diffstat (limited to 'src/logger.c')
-rw-r--r--src/logger.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/logger.c b/src/logger.c
index faa6c9721f..81196dbe00 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -37,10 +37,11 @@
#include "list.h"
#include "sd-daemon.h"
#include "tcpwrap.h"
+#include "def.h"
#define STREAMS_MAX 4096
#define SERVER_FD_MAX 16
-#define TIMEOUT ((int) (5*60*MSEC_PER_SEC))
+#define TIMEOUT_MSEC ((int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC))
typedef struct Stream Stream;
@@ -661,7 +662,7 @@ int main(int argc, char *argv[]) {
if ((k = epoll_wait(server.epoll_fd,
&event, 1,
- server.n_streams <= 0 ? TIMEOUT : -1)) < 0) {
+ server.n_streams <= 0 ? TIMEOUT_MSEC : -1)) < 0) {
if (errno == EINTR)
continue;