diff options
| author | Stefan Boberg <[email protected]> | 2026-03-18 10:10:50 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2026-03-18 10:10:50 +0100 |
| commit | 0faf85c9d83c85c18aa72e19458356bf9e45c59b (patch) | |
| tree | 1c2aba035aafa8526a5b8e28e2b0429099b84ef4 /src/zenutil/zenserverprocess.cpp | |
| parent | fix for GHES failing on upload-artifacts@v3 (#856) (diff) | |
| download | zen-0faf85c9d83c85c18aa72e19458356bf9e45c59b.tar.xz zen-0faf85c9d83c85c18aa72e19458356bf9e45c59b.zip | |
bugfix release - v5.7.23 (#851)
Works around issue where we could crash during startup when the logging system wasn't fully initialized and something used `ZEN_INFO` et al
Diffstat (limited to 'src/zenutil/zenserverprocess.cpp')
| -rw-r--r-- | src/zenutil/zenserverprocess.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/zenutil/zenserverprocess.cpp b/src/zenutil/zenserverprocess.cpp index ac614f779..e0d99c981 100644 --- a/src/zenutil/zenserverprocess.cpp +++ b/src/zenutil/zenserverprocess.cpp @@ -368,14 +368,16 @@ ZenServerState::Sweep() { if (ErrorCode) { - ZEN_WARN("Sweep - can not determine running state for pid {}, skipping entry (port {}). Reason: '{}'", - Entry.Pid.load(), - Entry.DesiredListenPort.load(), - ErrorCode.message()); + ZEN_CONSOLE_WARN("Sweep - can not determine running state for pid {}, skipping entry (port {}). Reason: '{}'", + Entry.Pid.load(), + Entry.DesiredListenPort.load(), + ErrorCode.message()); } else { - ZEN_DEBUG("Sweep - pid {} not running, reclaiming entry (port {})", Entry.Pid.load(), Entry.DesiredListenPort.load()); + ZEN_CONSOLE_DEBUG("Sweep - pid {} not running, reclaiming entry (port {})", + Entry.Pid.load(), + Entry.DesiredListenPort.load()); Entry.Reset(); } } @@ -402,10 +404,10 @@ ZenServerState::Snapshot(std::function<void(const ZenServerEntry&)>&& Callback) { if (ErrorCode) { - ZEN_WARN("Snapshot - can not determine running state for pid {}, skipping entry (port {}). Reason: '{}'", - Entry.Pid.load(), - Entry.DesiredListenPort.load(), - ErrorCode.message()); + ZEN_CONSOLE_WARN("Snapshot - can not determine running state for pid {}, skipping entry (port {}). Reason: '{}'", + Entry.Pid.load(), + Entry.DesiredListenPort.load(), + ErrorCode.message()); } else { |