diff options
Diffstat (limited to 'zenserver')
| -rw-r--r-- | zenserver/cache/structuredcache.cpp | 2 | ||||
| -rw-r--r-- | zenserver/compute/apply.h | 2 | ||||
| -rw-r--r-- | zenserver/diag/diagsvcs.h | 2 | ||||
| -rw-r--r-- | zenserver/diag/logging.cpp | 4 | ||||
| -rw-r--r-- | zenserver/projectstore.cpp | 6 | ||||
| -rw-r--r-- | zenserver/projectstore.h | 2 | ||||
| -rw-r--r-- | zenserver/upstream/jupiter.cpp | 2 | ||||
| -rw-r--r-- | zenserver/upstream/jupiter.h | 2 | ||||
| -rw-r--r-- | zenserver/zenserver.cpp | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp index 46f7cf86a..57def07b9 100644 --- a/zenserver/cache/structuredcache.cpp +++ b/zenserver/cache/structuredcache.cpp @@ -4,8 +4,8 @@ #include <zencore/compactbinaryvalidation.h> #include <zencore/compress.h> #include <zencore/fmtutils.h> -#include <zenhttp/httpserver.h> #include <zencore/timer.h> +#include <zenhttp/httpserver.h> #include "structuredcache.h" #include "structuredcachestore.h" diff --git a/zenserver/compute/apply.h b/zenserver/compute/apply.h index d377e4735..695dc2e6e 100644 --- a/zenserver/compute/apply.h +++ b/zenserver/compute/apply.h @@ -3,9 +3,9 @@ #pragma once #include <zencore/compactbinary.h> -#include <zenhttp/httpserver.h> #include <zencore/iohash.h> #include <zencore/logging.h> +#include <zenhttp/httpserver.h> #include <filesystem> #include <unordered_map> diff --git a/zenserver/diag/diagsvcs.h b/zenserver/diag/diagsvcs.h index 6d2b3a19d..82b7bdf15 100644 --- a/zenserver/diag/diagsvcs.h +++ b/zenserver/diag/diagsvcs.h @@ -2,8 +2,8 @@ #pragma once -#include <zenhttp/httpserver.h> #include <zencore/iobuffer.h> +#include <zenhttp/httpserver.h> ////////////////////////////////////////////////////////////////////////// diff --git a/zenserver/diag/logging.cpp b/zenserver/diag/logging.cpp index 796a15d01..5782ce582 100644 --- a/zenserver/diag/logging.cpp +++ b/zenserver/diag/logging.cpp @@ -195,13 +195,13 @@ InitializeLogging(const ZenServerOptions& GlobalOptions) std::filesystem::path LogPath = GlobalOptions.DataDir / "logs/zenserver.log"; - bool IsAsync = true; + bool IsAsync = true; spdlog::level::level_enum LogLevel = spdlog::level::info; if (GlobalOptions.IsDebug) { LogLevel = spdlog::level::debug; - IsAsync = false; + IsAsync = false; } if (IsAsync) diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index 006796b28..d49fb616e 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -1004,9 +1004,9 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects) ResponsePtr += sizeof(ResponseHdr); for (uint32_t ChunkIndex = 0; ChunkIndex < RequestHdr.ChunkCount; ++ChunkIndex) { - //const RequestChunkEntry& RequestedChunk = RequestedChunks[ChunkIndex]; - const IoBuffer& FoundChunk(OutBlobs[ChunkIndex + 1]); - ResponseChunkEntry ResponseChunk; + // const RequestChunkEntry& RequestedChunk = RequestedChunks[ChunkIndex]; + const IoBuffer& FoundChunk(OutBlobs[ChunkIndex + 1]); + ResponseChunkEntry ResponseChunk; ResponseChunk.CorrelationId = ChunkIndex; if (FoundChunk) { diff --git a/zenserver/projectstore.h b/zenserver/projectstore.h index 3a8e5f8f8..8fe189ab9 100644 --- a/zenserver/projectstore.h +++ b/zenserver/projectstore.h @@ -2,9 +2,9 @@ #pragma once -#include <zenhttp/httpserver.h> #include <zencore/uid.h> #include <zencore/xxhash.h> +#include <zenhttp/httpserver.h> #include <zenstore/cas.h> #include <zenstore/caslog.h> diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp index 2dd51fe6c..ba6300c65 100644 --- a/zenserver/upstream/jupiter.cpp +++ b/zenserver/upstream/jupiter.cpp @@ -81,7 +81,7 @@ CloudCacheSession::GetDerivedData(std::string_view BucketId, std::string_view Ke cpr::Response Response = Session.Get(); m_Log.debug("GET {}", Response); - + const bool Success = Response.status_code == 200; const IoBuffer Buffer = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer(); diff --git a/zenserver/upstream/jupiter.h b/zenserver/upstream/jupiter.h index 7595fe786..9f36704fa 100644 --- a/zenserver/upstream/jupiter.h +++ b/zenserver/upstream/jupiter.h @@ -2,9 +2,9 @@ #pragma once -#include <zenhttp/httpserver.h> #include <zencore/refcount.h> #include <zencore/thread.h> +#include <zenhttp/httpserver.h> #include <spdlog/spdlog.h> diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index e52f6aa60..2dbc4fefd 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -2,7 +2,6 @@ #include <zencore/filesystem.h> #include <zencore/fmtutils.h> -#include <zenhttp/httpserver.h> #include <zencore/iobuffer.h> #include <zencore/refcount.h> #include <zencore/scopeguard.h> @@ -10,6 +9,7 @@ #include <zencore/thread.h> #include <zencore/timer.h> #include <zencore/windows.h> +#include <zenhttp/httpserver.h> #include <zenserverprocess.h> #include <zenstore/cas.h> #include <zenstore/cidstore.h> |