diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-11 17:19:14 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-18 12:05:10 +0200 |
| commit | 651af149098289b60cdfb062d36eb435d8e49c52 (patch) | |
| tree | 72fefd7ed7effe2d1c54e5a8816b4513d4da2ab9 /src/buildtool/serve_api/serve_service/target.cpp | |
| parent | e0490fd703dcc177ee2e4dc7fc0650a535a53022 (diff) | |
| download | justbuild-651af149098289b60cdfb062d36eb435d8e49c52.tar.gz | |
Pass ServeApi to ServeServerImpl by reference
...instead of using singleton calls.
Diffstat (limited to 'src/buildtool/serve_api/serve_service/target.cpp')
| -rw-r--r-- | src/buildtool/serve_api/serve_service/target.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/buildtool/serve_api/serve_service/target.cpp b/src/buildtool/serve_api/serve_service/target.cpp index b34a7a63..024e5bae 100644 --- a/src/buildtool/serve_api/serve_service/target.cpp +++ b/src/buildtool/serve_api/serve_service/target.cpp @@ -38,7 +38,6 @@ #include "src/buildtool/multithreading/task_system.hpp" #include "src/buildtool/progress_reporting/progress.hpp" #include "src/buildtool/progress_reporting/progress_reporter.hpp" -#include "src/buildtool/serve_api/remote/serve_api.hpp" #include "src/buildtool/serve_api/serve_service/target_utils.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" @@ -453,13 +452,8 @@ auto TargetService::ServeTarget( AnalyseContext analyse_ctx{.repo_config = &repository_config, .target_cache = tc, .statistics = &stats, - .progress = &progress}; - -#ifndef BOOTSTRAP_BUILD_TOOL - if (RemoteServeConfig::Instance().RemoteAddress()) { - analyse_ctx.serve = &ServeApi::Instance(); - } -#endif // BOOTSTRAP_BUILD_TOOL + .progress = &progress, + .serve = serve_}; // analyse the configured target auto result = AnalyseTarget(&analyse_ctx, |