diff options
| -rw-r--r-- | src/buildtool/execution_api/execution_service/TARGETS | 1 | ||||
| -rw-r--r-- | src/buildtool/execution_api/execution_service/server_implementation.cpp | 2 | ||||
| -rw-r--r-- | src/buildtool/main/TARGETS | 1 | ||||
| -rw-r--r-- | src/buildtool/main/main.cpp | 6 |
4 files changed, 7 insertions, 3 deletions
diff --git a/src/buildtool/execution_api/execution_service/TARGETS b/src/buildtool/execution_api/execution_service/TARGETS index 6dfb45c2..85068f0f 100644 --- a/src/buildtool/execution_api/execution_service/TARGETS +++ b/src/buildtool/execution_api/execution_service/TARGETS @@ -79,7 +79,6 @@ , "bytestream_server" , "capabilities_server" , "operations_server" - , "file_chunker" , ["src/buildtool/execution_api/remote", "config"] , ["src/buildtool/auth", "auth"] , ["@", "json", "", "json"] diff --git a/src/buildtool/execution_api/execution_service/server_implementation.cpp b/src/buildtool/execution_api/execution_service/server_implementation.cpp index 8c4e77f3..9804c53e 100644 --- a/src/buildtool/execution_api/execution_service/server_implementation.cpp +++ b/src/buildtool/execution_api/execution_service/server_implementation.cpp @@ -30,7 +30,6 @@ #include "src/buildtool/execution_api/execution_service/capabilities_server.hpp" #include "src/buildtool/execution_api/execution_service/cas_server.hpp" #include "src/buildtool/execution_api/execution_service/execution_server.hpp" -#include "src/buildtool/execution_api/execution_service/file_chunker.hpp" #include "src/buildtool/execution_api/execution_service/operations_server.hpp" #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/logging/logger.hpp" @@ -117,7 +116,6 @@ auto ServerImpl::Run() -> bool { } } - FileChunker::Initialize(); server->Wait(); return true; } diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS index 0f30619c..bedcdcce 100644 --- a/src/buildtool/main/TARGETS +++ b/src/buildtool/main/TARGETS @@ -26,6 +26,7 @@ , ["src/buildtool/serve_api/remote", "config"] , ["src/buildtool/serve_api/serve_service", "serve_server_implementation"] , ["src/buildtool/common/remote", "retry_parameters"] + , ["src/buildtool/execution_api/execution_service", "file_chunker"] , "common" , "cli" , "version" diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp index d584f960..5241fa54 100644 --- a/src/buildtool/main/main.cpp +++ b/src/buildtool/main/main.cpp @@ -28,6 +28,7 @@ #include "src/buildtool/common/artifact_description.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/compatibility/compatibility.hpp" +#include "src/buildtool/execution_api/execution_service/file_chunker.hpp" #include "src/buildtool/execution_api/local/config.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/main/analyse.hpp" @@ -311,6 +312,10 @@ void SetupHashFunction() { : HashFunction::JustHash::Native); } +void SetupFileChunker() { + FileChunker::Initialize(); +} + void SetupRetryConfig(RetryArguments const& args) { if (args.max_attempts) { if (!Retry::SetMaxAttempts(*args.max_attempts)) { @@ -844,6 +849,7 @@ auto main(int argc, char* argv[]) -> int { GitContext::Create(); SetupHashFunction(); + SetupFileChunker(); SetupExecutionConfig( arguments.endpoint, arguments.build, arguments.rebuild); SetupServeConfig( |