From 6d3211775f00a8ef087b05594bd6fe251dd0e5b8 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Mon, 29 Jan 2024 15:52:48 +0100 Subject: fix response error conversion (#643) * make sure we properly convert compact-binary results to text when receiving errors * log fix --- src/zenserver/projectstore/remoteprojectstore.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/zenserver/projectstore') diff --git a/src/zenserver/projectstore/remoteprojectstore.cpp b/src/zenserver/projectstore/remoteprojectstore.cpp index 099b9ceb3..c85cd1825 100644 --- a/src/zenserver/projectstore/remoteprojectstore.cpp +++ b/src/zenserver/projectstore/remoteprojectstore.cpp @@ -1280,9 +1280,10 @@ SaveOplog(CidStore& ChunkStore, { if (BaseContainerResult.ErrorCode) { - ReportMessage( - OptionalContext, - fmt::format("Failed to load oplog base container ({}): {}", BaseContainerResult.ErrorCode, BaseContainerResult.Reason)); + ReportMessage(OptionalContext, + fmt::format("Failed to load oplog base container ({}): {}, uploading all attachments", + BaseContainerResult.ErrorCode, + BaseContainerResult.Reason)); } else { @@ -1308,7 +1309,7 @@ SaveOplog(CidStore& ChunkStore, KnownBlocks.push_back({.BlockHash = BlockHash, .ChunksInBlock = std::move(ChunksInBlock)}); }; } - ReportMessage(OptionalContext, fmt::format("Loading oplog base container in {:.3} s", BaseContainerResult.ElapsedSeconds)); + ReportMessage(OptionalContext, fmt::format("Loaded oplog base container in {:.3} s", BaseContainerResult.ElapsedSeconds)); } } -- cgit v1.2.3