aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--zenserver/zenserver.cpp9
-rw-r--r--zenstore-test/zenstore-test.cpp7
2 files changed, 11 insertions, 5 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index e8d9477ea..c64b6f870 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -1034,12 +1034,15 @@ ZenEntryPoint::Run()
else
{
struct rlimit NewLimit = Limit;
- NewLimit.rlim_cur = 10240;
- NewLimit.rlim_max = 10240;
+ // NewLimit.rlim_cur = 10240;
+ // NewLimit.rlim_max = 10240;
+ NewLimit.rlim_cur = NewLimit.rlim_max;
+ ZEN_INFO("changing RLIMIT_NOFILE from rlim_cur = {}, rlim_max {} to rlim_cur = {}, rlim_max {}", Limit.rlim_cur, Limit.rlim_max, NewLimit.rlim_cur, NewLimit.rlim_max);
+
Error = setrlimit(RLIMIT_NOFILE, &NewLimit);
if (Error != 0)
{
- ZEN_WARN("failed to set RLIMIT_NOFILE limits from rlim_cur = {}, rlim_max {} to rlim_cur = {}, rlim_max {}, reason '{}'", Limit.rlim_cur, Limit.rlim_max, NewLimit.rlim_cur, NewLimit.rlim_max, MakeErrorCode(Error).message());
+ ZEN_WARN("failed to set RLIMIT_NOFILE limits from rlim_cur = {}, rlim_max {} to rlim_cur = {}, rlim_max {}, reason '{}'", Limit.rlim_cur, Limit.rlim_max, NewLimit.rlim_cur, NewLimit.rlim_max, zen::MakeErrorCode(Error).message());
}
}
#endif
diff --git a/zenstore-test/zenstore-test.cpp b/zenstore-test/zenstore-test.cpp
index 33844fa41..4a4035ab1 100644
--- a/zenstore-test/zenstore-test.cpp
+++ b/zenstore-test/zenstore-test.cpp
@@ -34,8 +34,11 @@ main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
else
{
struct rlimit NewLimit = Limit;
- NewLimit.rlim_cur = 10240;
- NewLimit.rlim_max = 10240;
+// NewLimit.rlim_cur = 10240;
+// NewLimit.rlim_max = 10240;
+ NewLimit.rlim_cur = NewLimit.rlim_max;
+ ZEN_WARN("changing RLIMIT_NOFILE from rlim_cur = {}, rlim_max {} to rlim_cur = {}, rlim_max {}", Limit.rlim_cur, Limit.rlim_max, NewLimit.rlim_cur, NewLimit.rlim_max);
+
Error = setrlimit(RLIMIT_NOFILE, &NewLimit);
if (Error != 0)
{