aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2024-05-27 16:26:08 +0200
committerGitHub Enterprise <[email protected]>2024-05-27 16:26:08 +0200
commitfb3ffc1edaae40421cf36a835570db10a7406add (patch)
tree19e39c71820fe0373d917b061f59bc10a21da33d
parentfix iterate chunks crash (#86) (diff)
downloadzen-fb3ffc1edaae40421cf36a835570db10a7406add.tar.xz
zen-fb3ffc1edaae40421cf36a835570db10a7406add.zip
don't use "error:" in log messages unless there is an error (#87)
Improvement: Don't use "error:" in log messages unless there is an error as Horde CI will pick up that log line and interpret it as an error
-rw-r--r--CHANGELOG.md1
-rw-r--r--src/zenserver/main.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b3314b09..04b45431f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
- Improvement: Asserts gives an immediate ERROR log entry with callstack and reason
- Improvement: Asserts flushes the log before sending error report to Sentry
- Improvement: Refactored IterateChunks to allow reuse in diskcachelayer and hide public GetBlockFile() function in BlockStore
+- Improvement: Don't use "error:" in log messages unless there is an error as Horde CI will pick up that log line and interpret it as an error
## 5.4.5
- Bugfix: If we get a request for a partial chunk that can not be fulfilled we warn and treat it as a miss
diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp
index b96118484..023abc8a3 100644
--- a/src/zenserver/main.cpp
+++ b/src/zenserver/main.cpp
@@ -166,13 +166,13 @@ ZenEntryPoint::Run()
if (Ec)
{
- ZEN_WARN("Unable to grab lock at '{}' (error: '{}'), retrying", LockFilePath, Ec.message());
+ ZEN_WARN("Unable to grab lock at '{}' (reason: '{}'), retrying", LockFilePath, Ec.message());
Sleep(500);
m_LockFile.Create(LockFilePath, MakeLockData(false), Ec);
if (Ec)
{
- ZEN_WARN("ERROR: Unable to grab lock at '{}' (error: '{}')", LockFilePath, Ec.message());
+ ZEN_WARN("ERROR: Unable to grab lock at '{}' (reason: '{}')", LockFilePath, Ec.message());
std::exit(99);
}
}