From 15e034da3f567c9053b0464e8a002d08e6d18b78 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Thu, 8 Sep 2022 12:31:11 +0200 Subject: Adjust errors vs warnings messages (#160) * demote a number of ZEN_ERROR to ZEN_WARN * changelog --- zenserver/cache/structuredcachestore.cpp | 2 +- zenserver/projectstore.cpp | 8 +++---- zenserver/upstream/upstreamcache.cpp | 40 ++++++++++++++++---------------- zenserver/zenserver.cpp | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) (limited to 'zenserver') diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp index 76a8707c5..e25759192 100644 --- a/zenserver/cache/structuredcachestore.cpp +++ b/zenserver/cache/structuredcachestore.cpp @@ -1132,7 +1132,7 @@ ZenCacheDiskLayer::CacheBucket::Scrub(ScrubContext& Ctx) if (!BadKeys.empty()) { - ZEN_ERROR("Scrubbing found #{} bad chunks in '{}'", BadKeys.size(), m_BucketDir / m_BucketName); + ZEN_WARN("Scrubbing found #{} bad chunks in '{}'", BadKeys.size(), m_BucketDir / m_BucketName); if (Ctx.RunRecovery()) { diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index e42704ccf..93276f029 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -784,7 +784,7 @@ ProjectStore::Project::OpenOplog(std::string_view OplogId) } catch (std::exception& ex) { - ZEN_ERROR("failed to open oplog '{}' @ '{}': {}", OplogId, OplogBasePath, ex.what()); + ZEN_WARN("failed to open oplog '{}' @ '{}': {}", OplogId, OplogBasePath, ex.what()); m_Oplogs.erase(std::string{OplogId}); } @@ -1582,7 +1582,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects) std::filesystem::path BadPackagePath = Oplog.TempPath() / "bad_packages" / fmt::format("session{}_request{}", HttpReq.SessionId(), HttpReq.RequestId()); - ZEN_ERROR("Received malformed package! Saving payload to '{}'", BadPackagePath); + ZEN_WARN("Received malformed package! Saving payload to '{}'", BadPackagePath); zen::WriteFile(BadPackagePath, Payload); @@ -1667,7 +1667,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects) { // Error - malformed object - ZEN_ERROR("malformed object returned for {}", AttachmentHash); + ZEN_WARN("malformed object returned for {}", AttachmentHash); } break; @@ -1680,7 +1680,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects) { // Error - not compressed! - ZEN_ERROR("invalid compressed binary returned for {}", AttachmentHash); + ZEN_WARN("invalid compressed binary returned for {}", AttachmentHash); } break; diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp index e92dde815..e8f7450fd 100644 --- a/zenserver/upstream/upstreamcache.cpp +++ b/zenserver/upstream/upstreamcache.cpp @@ -1497,10 +1497,10 @@ public: { Stats.CacheErrorCount.Increment(1); - ZEN_ERROR("get cache record FAILED, endpoint '{}', reason '{}', error code '{}'", - Endpoint->GetEndpointInfo().Url, - Result.Error.Reason, - Result.Error.ErrorCode); + ZEN_WARN("get cache record FAILED, endpoint '{}', reason '{}', error code '{}'", + Endpoint->GetEndpointInfo().Url, + Result.Error.Reason, + Result.Error.ErrorCode); } } } @@ -1559,10 +1559,10 @@ public: { Stats.CacheErrorCount.Increment(1); - ZEN_ERROR("get cache record(s) (rpc) FAILED, endpoint '{}', reason '{}', error code '{}'", - Endpoint->GetEndpointInfo().Url, - Result.Error.Reason, - Result.Error.ErrorCode); + ZEN_WARN("get cache record(s) (rpc) FAILED, endpoint '{}', reason '{}', error code '{}'", + Endpoint->GetEndpointInfo().Url, + Result.Error.Reason, + Result.Error.ErrorCode); } RemainingKeys = std::move(Missing); @@ -1626,10 +1626,10 @@ public: { Stats.CacheErrorCount.Increment(1); - ZEN_ERROR("get cache values(s) (rpc) FAILED, endpoint '{}', reason '{}', error code '{}'", - Endpoint->GetEndpointInfo().Url, - Result.Error.Reason, - Result.Error.ErrorCode); + ZEN_WARN("get cache values(s) (rpc) FAILED, endpoint '{}', reason '{}', error code '{}'", + Endpoint->GetEndpointInfo().Url, + Result.Error.Reason, + Result.Error.ErrorCode); } RemainingKeys = std::move(Missing); @@ -1679,10 +1679,10 @@ public: { Stats.CacheErrorCount.Increment(1); - ZEN_ERROR("get cache value FAILED, endpoint '{}', reason '{}', error code '{}'", - Endpoint->GetEndpointInfo().Url, - Result.Error.Reason, - Result.Error.ErrorCode); + ZEN_WARN("get cache value FAILED, endpoint '{}', reason '{}', error code '{}'", + Endpoint->GetEndpointInfo().Url, + Result.Error.Reason, + Result.Error.ErrorCode); } } } @@ -1741,10 +1741,10 @@ public: { Stats.CacheErrorCount.Increment(1); - ZEN_ERROR("get cache values(s) (rpc) FAILED, endpoint '{}', reason '{}', error code '{}'", - Endpoint->GetEndpointInfo().Url, - Result.Error.Reason, - Result.Error.ErrorCode); + ZEN_WARN("get cache values(s) (rpc) FAILED, endpoint '{}', reason '{}', error code '{}'", + Endpoint->GetEndpointInfo().Url, + Result.Error.Reason, + Result.Error.ErrorCode); } RemainingKeys = std::move(Missing); diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index 2effa4e68..9e15b0c64 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -668,7 +668,7 @@ ZenServer::InitializeState(const ZenServerOptions& ServerOptions) if (CbValidateError ValidationResult = ValidateCompactBinary(Manifest, CbValidateMode::All); ValidationResult != CbValidateError::None) { - ZEN_ERROR("Manifest validation failed: {}, state will be wiped", uint32_t(ValidationResult)); + ZEN_WARN("Manifest validation failed: {}, state will be wiped", uint32_t(ValidationResult)); WipeState = true; WipeReason = fmt::format("Validation of manifest at '{}' failed: {}", ManifestPath, uint32_t(ValidationResult)); -- cgit v1.2.3