diff options
| author | Ellie Huxtable <ellie@atuin.sh> | 2024-07-10 15:46:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-10 15:46:51 +0100 |
| commit | 353981e79455ec42a692d384d403dcda112704bd (patch) | |
| tree | 993b6592b415a921399d3276848e47e04ce757d6 /crates/atuin-daemon/src/client.rs | |
| parent | chore(deps): bump react-spinners from 0.13.8 to 0.14.1 in /ui (#2220) (diff) | |
| download | atuin-353981e79455ec42a692d384d403dcda112704bd.zip | |
chore(deps): update to tonic 0.12, prost 0.13 (#2250)
Resolve #2248
Diffstat (limited to 'crates/atuin-daemon/src/client.rs')
| -rw-r--r-- | crates/atuin-daemon/src/client.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crates/atuin-daemon/src/client.rs b/crates/atuin-daemon/src/client.rs index f3fecdbc..3de872d2 100644 --- a/crates/atuin-daemon/src/client.rs +++ b/crates/atuin-daemon/src/client.rs @@ -4,6 +4,8 @@ use tokio::net::TcpStream; use tonic::transport::{Channel, Endpoint, Uri}; use tower::service_fn; +use hyper_util::rt::TokioIo; + #[cfg(unix)] use tokio::net::UnixStream; @@ -23,9 +25,11 @@ impl HistoryClient { pub async fn new(path: String) -> Result<Self> { let channel = Endpoint::try_from("http://atuin_local_daemon:0")? .connect_with_connector(service_fn(move |_: Uri| { - let path = path.to_string(); + let path = path.clone(); - UnixStream::connect(path) + async move { + Ok::<_, std::io::Error>(TokioIo::new(UnixStream::connect(path.clone()).await?)) + } })) .await .map_err(|_| eyre!("failed to connect to local atuin daemon. Is it running?"))?; @@ -40,6 +44,7 @@ impl HistoryClient { let channel = Endpoint::try_from("http://atuin_local_daemon:0")? .connect_with_connector(service_fn(move |_: Uri| { let url = format!("127.0.0.1:{}", port); + TcpStream::connect(url) })) .await |
