diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2024-07-08 15:24:57 +0200 |
|---|---|---|
| committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2024-07-16 17:51:12 +0200 |
| commit | 57b7ec186b740b94df030e2f064c28148dd30749 (patch) | |
| tree | ddd445ceddf4b2d16c2749db04463354a691f3a9 /src/buildtool/main/main.cpp | |
| parent | 24c900225902337feee7a8cc4399fdffdecd945f (diff) | |
| download | justbuild-57b7ec186b740b94df030e2f064c28148dd30749.tar.gz | |
Pass RemoteExecutionConfig instance to ApiBundle
...and store it as a const ref for subsequent use wherever the apis
are already passed.
Diffstat (limited to 'src/buildtool/main/main.cpp')
| -rw-r--r-- | src/buildtool/main/main.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp index a82a6db8..5e296482 100644 --- a/src/buildtool/main/main.cpp +++ b/src/buildtool/main/main.cpp @@ -874,7 +874,7 @@ auto main(int argc, char* argv[]) -> int { &*local_exec_config, /*repo_config=*/nullptr, &*auth_config, - RemoteExecutionConfig::RemoteAddress()}; + &RemoteExecutionConfig::Instance()}; if (not ServerImpl::Instance().Run( *storage_config, storage, exec_apis)) { return kExitFailure; @@ -901,13 +901,12 @@ auto main(int argc, char* argv[]) -> int { auto const storage = Storage::Create(&*storage_config); StoreTargetCacheShard(*storage_config, storage); - ApiBundle const serve_apis{ - &*storage_config, - &storage, - &*local_exec_config, - /*repo_config=*/nullptr, - &*auth_config, - RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const serve_apis{&*storage_config, + &storage, + &*local_exec_config, + /*repo_config=*/nullptr, + &*auth_config, + &RemoteExecutionConfig::Instance()}; auto serve = ServeApi::Create(*serve_config, &storage, &serve_apis); bool with_execute = not RemoteExecutionConfig::RemoteAddress(); @@ -990,7 +989,7 @@ auto main(int argc, char* argv[]) -> int { &*local_exec_config, &repo_config, &*auth_config, - RemoteExecutionConfig::RemoteAddress()}; + &RemoteExecutionConfig::Instance()}; GraphTraverser const traverser{ {jobs, std::move(arguments.build), |