diff options
| author | Florian Klink <flokli@flokli.de> | 2023-11-13T12·32+0200 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2023-11-15T06·43+0000 |
| commit | 30e0c320666f8ecaf37f6d966e45c40f988cce78 (patch) | |
| tree | 808bdb2c8832e2083bc17493dc8982b755486824 /tvix/castore/src/errors.rs | |
| parent | c83841d3a13a5d5b3fdaa7f9beecd743f1283691 (diff) | |
refactor(tvix/castore/tonic): make async, support wait-connect=? r/7022
This moves the sync `channel::from_url` to a async `tonic::channel_from_url`. It now allows connecting non-lazily if `wait- connect=1` is set in the URL params. Also, make the pingpong tests for blobsvc and directorysvc use the wait- connect=1 codepath. Change-Id: Ibeea33117c8121814627e7f6aba0e943ae2e92ca Reviewed-on: https://cl.tvl.fyi/c/depot/+/10030 Tested-by: BuildkiteCI Reviewed-by: Connor Brewster <cbrewster@hey.com>
Diffstat (limited to 'tvix/castore/src/errors.rs')
| -rw-r--r-- | tvix/castore/src/errors.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tvix/castore/src/errors.rs b/tvix/castore/src/errors.rs index 9f596afd4e26..4c164029aeec 100644 --- a/tvix/castore/src/errors.rs +++ b/tvix/castore/src/errors.rs @@ -34,8 +34,8 @@ impl From<Error> for Status { } } -impl From<crate::channel::Error> for Error { - fn from(value: crate::channel::Error) -> Self { +impl From<crate::tonic::Error> for Error { + fn from(value: crate::tonic::Error) -> Self { Self::StorageError(value.to_string()) } } |