diff options
| author | Florian Klink <flokli@flokli.de> | 2023-09-26T07·30+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-09-26T10·07+0000 |
| commit | 6b02800e486a46e28d6bec79ba3ba94fe006e8c5 (patch) | |
| tree | c4618647fcae77581956a065d5809f3186e386ad /tvix/store/src | |
| parent | 329067f62954f09bcaf87a016f4211fdcf9789dd (diff) | |
chore(tvix/[ca]store): allow building without tonic-reflection r/6660
- rename the feature to `tonic-reflection` in both tvix-store and tvix- castore. - set it to disabled in tvix-castore by default - enable it in tvix-store, and pull in tvix-castore with the feature enabled. Change-Id: Ie22833d85569502cae55812f6eeb17a9c15b9e2c Reviewed-on: https://cl.tvl.fyi/c/depot/+/9472 Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Diffstat (limited to 'tvix/store/src')
| -rw-r--r-- | tvix/store/src/bin/tvix-store.rs | 6 | ||||
| -rw-r--r-- | tvix/store/src/proto/mod.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tvix/store/src/bin/tvix-store.rs b/tvix/store/src/bin/tvix-store.rs index e80014047ca4..14b38da0a5c7 100644 --- a/tvix/store/src/bin/tvix-store.rs +++ b/tvix/store/src/bin/tvix-store.rs @@ -33,9 +33,9 @@ use tvix_store::fs::fuse::FuseDaemon; #[cfg(feature = "virtiofs")] use tvix_store::fs::virtiofs::start_virtiofs_daemon; -#[cfg(feature = "reflection")] +#[cfg(feature = "tonic-reflection")] use tvix_castore::proto::FILE_DESCRIPTOR_SET as CASTORE_FILE_DESCRIPTOR_SET; -#[cfg(feature = "reflection")] +#[cfg(feature = "tonic-reflection")] use tvix_store::proto::FILE_DESCRIPTOR_SET; use clap::Parser; @@ -210,7 +210,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> { GRPCPathInfoServiceWrapper::from(path_info_service), )); - #[cfg(feature = "reflection")] + #[cfg(feature = "tonic-reflection")] { let reflection_svc = tonic_reflection::server::Builder::configure() .register_encoded_file_descriptor_set(CASTORE_FILE_DESCRIPTOR_SET) diff --git a/tvix/store/src/proto/mod.rs b/tvix/store/src/proto/mod.rs index 6924b023c942..f2bec10f1644 100644 --- a/tvix/store/src/proto/mod.rs +++ b/tvix/store/src/proto/mod.rs @@ -10,7 +10,7 @@ pub use grpc_pathinfoservice_wrapper::GRPCPathInfoServiceWrapper; tonic::include_proto!("tvix.store.v1"); -#[cfg(feature = "reflection")] +#[cfg(feature = "tonic-reflection")] /// Compiled file descriptors for implementing [gRPC /// reflection](https://github.com/grpc/grpc/blob/master/doc/server-reflection.md) with e.g. /// [`tonic_reflection`](https://docs.rs/tonic-reflection). |