aboutsummaryrefslogtreecommitdiff
path: root/zenserver
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-09-09 13:13:27 +0200
committerStefan Boberg <[email protected]>2021-09-09 13:13:27 +0200
commit9ea46c26939261b4a432efef245e2662dc9f4eb0 (patch)
tree8f50142f2d0a379b66ffe9a7e9187102d2cb9207 /zenserver
parentRestructuring HTTP server implementation to better (completely asynchronously... (diff)
parentEliminate compiler default library warning for msvcrt (diff)
downloadzen-9ea46c26939261b4a432efef245e2662dc9f4eb0.tar.xz
zen-9ea46c26939261b4a432efef245e2662dc9f4eb0.zip
Merge branch 'main' into cbpackage-update
Diffstat (limited to 'zenserver')
-rw-r--r--zenserver/experimental/usnjournal.cpp1
-rw-r--r--zenserver/projectstore.cpp6
-rw-r--r--zenserver/upstream/jupiter.cpp1
-rw-r--r--zenserver/upstream/upstreamcache.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/zenserver/experimental/usnjournal.cpp b/zenserver/experimental/usnjournal.cpp
index a266c2338..0553945dd 100644
--- a/zenserver/experimental/usnjournal.cpp
+++ b/zenserver/experimental/usnjournal.cpp
@@ -249,6 +249,7 @@ UsnJournalReader::Initialize(std::filesystem::path VolumePath)
{
// This captures file modification ranges. We do not yet support this however
USN_RECORD_V4& Record = CommonRecord->V4;
+ ZEN_UNUSED(Record);
}
break;
}
diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp
index 33d008f3e..006796b28 100644
--- a/zenserver/projectstore.cpp
+++ b/zenserver/projectstore.cpp
@@ -912,8 +912,6 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
return HttpReq.WriteResponse(HttpResponse::NotFound);
}
- ProjectStore::Oplog& Log = *FoundLog;
-
// Parse Request
IoBuffer Payload = HttpReq.ReadPayload();
@@ -1006,7 +1004,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
ResponsePtr += sizeof(ResponseHdr);
for (uint32_t ChunkIndex = 0; ChunkIndex < RequestHdr.ChunkCount; ++ChunkIndex)
{
- const RequestChunkEntry& RequestedChunk = RequestedChunks[ChunkIndex];
+ //const RequestChunkEntry& RequestedChunk = RequestedChunks[ChunkIndex];
const IoBuffer& FoundChunk(OutBlobs[ChunkIndex + 1]);
ResponseChunkEntry ResponseChunk;
ResponseChunk.CorrelationId = ChunkIndex;
@@ -1282,8 +1280,6 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
return HttpReq.WriteResponse(HttpResponse::NotFound);
}
- ProjectStore::Oplog& Log = *FoundLog;
-
// This operation takes a list of referenced hashes and decides which
// chunks are not present on this server. This list is then returned in
// the "need" list in the response
diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp
index 815e9014e..2dd51fe6c 100644
--- a/zenserver/upstream/jupiter.cpp
+++ b/zenserver/upstream/jupiter.cpp
@@ -354,6 +354,7 @@ CloudCacheClient::AcquireAccessToken(std::string& AuthorizationHeaderValue)
std::string AccessToken = JsonResponse["access_token"].string_value();
int ExpiryTimeSeconds = JsonResponse["expires_in"].int_value();
+ ZEN_UNUSED(ExpiryTimeSeconds);
m_AccessToken.SetToken(AccessToken);
diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index 9e566749a..aef9c0bb3 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/zenserver/upstream/upstreamcache.cpp
@@ -417,6 +417,8 @@ private:
const StatCounters& Counters = Kv.second;
const double TotalMb = double(Counters.Bytes) / 1024.0 / 1024.0;
+ ZEN_UNUSED(Endpoint);
+
m_Log.info("{} Endpoint: {}, Bytes: {:.2f} MB, Time: {:.2f} s, Speed: {:.2f} MB/s, Avg: {:.2f} ms/request, Samples: {}",
What,
Kv.first->DisplayName(),