maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix): move service addrs into shared clap struct

Browse source 
Change-Id: I7cab29ecfa1823c2103b4c47b7d784bc31459d55
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12008
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: yuka <yuka@yuka.dev>
This commit is contained in:
Yureka 2024-07-21 16:41:09 +02:00 • committed by yuka
parent 6774d9c59c
commit 67335c41b7
12 changed files with 132 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tvix/cli/src/args.rs
View file

@ -2,6 +2,7 @@ use std::path::PathBuf;
use clap::Parser;
use tracing::Level;
use tvix_store::utils::ServiceUrlsMemory;
#[derive(Parser, Clone)]
pub struct Args {
@ -58,14 +59,8 @@ pub struct Args {
#[clap(long)]
pub strict: bool,
#[arg(long, env, default_value = "memory://")]
pub blob_service_addr: String,
#[arg(long, env, default_value = "memory://")]
pub directory_service_addr: String,
#[arg(long, env, default_value = "memory://")]
pub path_info_service_addr: String,
#[clap(flatten)]
pub service_addrs: ServiceUrlsMemory,
#[arg(long, env, default_value = "dummy://")]
pub build_service_addr: String,

16
tvix/cli/src/lib.rs
View file

@ -27,19 +27,9 @@ pub use repl::Repl;
pub fn init_io_handle(tokio_runtime: &tokio::runtime::Runtime, args: &Args) -> Rc<TvixStoreIO> {
let (blob_service, directory_service, path_info_service, nar_calculation_service) =
tokio_runtime
.block_on({
let blob_service_addr = args.blob_service_addr.clone();
let directory_service_addr = args.directory_service_addr.clone();
let path_info_service_addr = args.path_info_service_addr.clone();
async move {
tvix_store::utils::construct_services(
blob_service_addr,
directory_service_addr,
path_info_service_addr,
)
.await
}
})
.block_on(tvix_store::utils::construct_services(
args.service_addrs.clone(),
))
.expect("unable to setup {blob|directory|pathinfo}service before interpreter setup");
let build_service = tokio_runtime