aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzousar <[email protected]>2023-08-18 14:27:37 -0600
committerGitHub <[email protected]>2023-08-18 14:27:37 -0600
commite515c302f58f9189731ef1b6a0ab6a90b1d98e94 (patch)
tree76d89831fdb2920cccecb2c05d0913b48820ce5d
parent0.2.17-pre0 (diff)
parentNoted RLIMIT logging modification in Changelog (diff)
downloadzen-e515c302f58f9189731ef1b6a0ab6a90b1d98e94.tar.xz
zen-e515c302f58f9189731ef1b6a0ab6a90b1d98e94.zip
Merge pull request #364 from EpicGames/zs/mac-linux-rlimit-stdout
Reduce log level for RLIMIT message
-rw-r--r--CHANGELOG.md1
-rw-r--r--src/zencore/filesystem.cpp10
2 files changed, 6 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2edc2efc6..7a0faae55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
- `--project` Project name (id)
- `--oplog` Oplog name (id)
- Bugfix: Make sure to check oplog op attachments when gathering references for GC
+- Bugfix: Reduce log level of RLIMIT message on Mac/Linux to avoid it interfering with parsing of stdout from `zen version` command
- Improvement: Add endpoint in project store to update the information in a project without deleting the stored data/oplog
- Improvement: Add endpoint in project store to update the information in a project without deleting the stored data/oplog
- Improvement: Add oplog op content to error result if attachment is missing when doing `oplog-export`
diff --git a/src/zencore/filesystem.cpp b/src/zencore/filesystem.cpp
index 059d1b5f0..daf668290 100644
--- a/src/zencore/filesystem.cpp
+++ b/src/zencore/filesystem.cpp
@@ -1137,11 +1137,11 @@ MaximizeOpenFileCount()
{
struct rlimit NewLimit = Limit;
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);
+ ZEN_DEBUG("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)