diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/zenhttp/httpclient.cpp | 2 | ||||
| -rw-r--r-- | src/zenserver/projectstore/remoteprojectstore.cpp | 9 | ||||
| -rw-r--r-- | src/zenserver/upstream/jupiter.cpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/zenhttp/httpclient.cpp b/src/zenhttp/httpclient.cpp index 07f631dac..c9005b1cf 100644 --- a/src/zenhttp/httpclient.cpp +++ b/src/zenhttp/httpclient.cpp @@ -1089,7 +1089,7 @@ HttpClient::Response::ErrorMessage(std::string_view Prefix) const } else if (StatusCode != HttpResponseCode::ImATeapot && (int)StatusCode) { - return fmt::format("{}: HTTP error {} {} ({})", Prefix, (int)StatusCode, zen::ToString(StatusCode), AsText()); + return fmt::format("{}: HTTP error {} {} ({})", Prefix, (int)StatusCode, zen::ToString(StatusCode), ToText()); } else { 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)); } } diff --git a/src/zenserver/upstream/jupiter.cpp b/src/zenserver/upstream/jupiter.cpp index bfe797712..fe4d31604 100644 --- a/src/zenserver/upstream/jupiter.cpp +++ b/src/zenserver/upstream/jupiter.cpp @@ -195,7 +195,7 @@ CloudCacheSession::FinalizeRef(std::string_view Namespace, std::string_view Buck if (Result.Success) { std::string JsonError; - json11::Json Json = json11::Json::parse(std::string(Response.AsText()), JsonError); + json11::Json Json = json11::Json::parse(std::string(Response.ToText()), JsonError); if (JsonError.empty()) { json11::Json::array Needs = Json["needs"].array_items(); |