From 06b855533b8b6f09575bc223e92a4b4fa6062eb4 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Wed, 27 Jan 2016 14:17:48 +0100 Subject: [PATCH] main: don't exit on setrlimit() failures Exiting would prevent operation under valgrind. --- src/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index 309de641..c3549219 100644 --- a/src/main.c +++ b/src/main.c @@ -523,8 +523,7 @@ static void update_fd_limits(main_server_st *s, unsigned main) new_set.rlim_max = new_set.rlim_cur; ret = setrlimit(RLIMIT_NOFILE, &new_set); if (ret < 0) { - fprintf(stderr, "error in setrlimit(%u): %s\n", max, strerror(errno)); - exit(1); + fprintf(stderr, "error in setrlimit(%u): %s (cur: %u)\n", max, strerror(errno), (unsigned)def_set.rlim_cur); } } } else { @@ -532,7 +531,6 @@ static void update_fd_limits(main_server_st *s, unsigned main) ret = setrlimit(RLIMIT_NOFILE, &def_set); if (ret < 0) { fprintf(stderr, "error in setrlimit(%u): %s\n", (unsigned)def_set.rlim_cur, strerror(errno)); - exit(1); } } #endif