diff options
Diffstat (limited to 'zenserver/zenserver.cpp')
| -rw-r--r-- | zenserver/zenserver.cpp | 48 |
1 files changed, 3 insertions, 45 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index 9ee2d8b22..85d62c9f6 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -1024,28 +1024,7 @@ ZenEntryPoint::Run() InitializeLogging(ServerOptions); -#if ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC - struct rlimit Limit; - int Error = getrlimit(RLIMIT_NOFILE, &Limit); - if (Error) - { - ZEN_WARN("failed getting rlimit RLIMIT_NOFILE, reason '{}'", zen::MakeErrorCode(Error).message()); - } - else - { - struct rlimit NewLimit = Limit; - // 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, zen::MakeErrorCode(Error).message()); - } - } -#endif + zen::InitializeOpenFileCount(); ZEN_INFO(ZEN_APP_NAME " - using lock file at '{}'", LockFilePath); @@ -1185,31 +1164,10 @@ test_main(int argc, char** argv) zen::z$_forcelink(); zen::logging::InitializeLogging(); -#if ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC - struct rlimit Limit; - int Error = getrlimit(RLIMIT_NOFILE, &Limit); - if (Error) - { - ZEN_WARN("failed getting rlimit RLIMIT_NOFILE, reason '{}'", zen::MakeErrorCode(Error).message()); - } - else - { - struct rlimit NewLimit = Limit; -// 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, zen::MakeErrorCode(Error).message()); - } - } -#endif - spdlog::set_level(spdlog::level::debug); + zen::InitializeOpenFileCount(); + return doctest::Context(argc, argv).run(); } #endif |