summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorprudhvi <>2020-06-09 20:51:13 +0000
committerdormando <dormando@rydia.net>2020-07-01 18:36:09 -0700
commitf68e1f3fc6d60197271ca4820305adccde497318 (patch)
tree36c5cee89bffd39ca532c9031b3c04fbdc3e9427
parent8e5148ca5c32fafca948e43c2e966db28a50a5f4 (diff)
downloadmemcached-f68e1f3fc6d60197271ca4820305adccde497318.tar.gz
skip setting the resource limits in debug builds
if they are already greater than the maxconns
-rw-r--r--memcached.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/memcached.c b/memcached.c
index dc67267..bb56a5b 100644
--- a/memcached.c
+++ b/memcached.c
@@ -10039,12 +10039,18 @@ int main (int argc, char **argv) {
fprintf(stderr, "failed to getrlimit number of files\n");
exit(EX_OSERR);
} else {
+#ifdef MEMCACHED_DEBUG
+ if (rlim.rlim_cur < settings.maxconns || rlim.rlim_max < settings.maxconns) {
+#endif
rlim.rlim_cur = settings.maxconns;
rlim.rlim_max = settings.maxconns;
if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) {
fprintf(stderr, "failed to set rlimit for open files. Try starting as root or requesting smaller maxconns value.\n");
exit(EX_OSERR);
}
+#ifdef MEMCACHED_DEBUG
+ }
+#endif
}
/* lose root privileges if we have them */