aboutsummaryrefslogtreecommitdiffstats
path: root/crates/turtle/src/command/client/search
diff options
context:
space:
mode:
Diffstat (limited to 'crates/turtle/src/command/client/search')
-rw-r--r--crates/turtle/src/command/client/search/engines/daemon.rs30
1 files changed, 1 insertions, 29 deletions
diff --git a/crates/turtle/src/command/client/search/engines/daemon.rs b/crates/turtle/src/command/client/search/engines/daemon.rs
index cb0fdf7d..ee92ebaf 100644
--- a/crates/turtle/src/command/client/search/engines/daemon.rs
+++ b/crates/turtle/src/command/client/search/engines/daemon.rs
@@ -3,7 +3,7 @@ use crate::atuin_client::{
history::History,
settings::{SearchMode, Settings},
};
-use crate::atuin_daemon::client::{DaemonClientErrorKind, SearchClient, classify_error};
+use crate::atuin_daemon::client::SearchClient;
use async_trait::async_trait;
use atuin_nucleo_matcher::{
Config, Matcher, Utf32Str,
@@ -14,12 +14,10 @@ use tracing::{Level, debug, instrument, span};
use uuid::Uuid;
use super::{SearchEngine, SearchState};
-use crate::command::client::daemon;
pub(crate) struct Search {
client: Option<SearchClient>,
query_id: u64,
- settings: Settings,
#[cfg(unix)]
socket_path: String,
}
@@ -29,7 +27,6 @@ impl Search {
Self {
client: None,
query_id: 0,
- settings: settings.clone(),
#[cfg(unix)]
socket_path: settings.daemon.socket_path.clone(),
}
@@ -51,15 +48,6 @@ impl Search {
Ok(())
}
- fn should_retry(err: &eyre::Report) -> bool {
- matches!(
- classify_error(err),
- DaemonClientErrorKind::Connect
- | DaemonClientErrorKind::Unavailable
- | DaemonClientErrorKind::Unimplemented
- )
- }
-
fn next_query_id(&mut self) -> u64 {
self.query_id += 1;
self.query_id
@@ -142,22 +130,6 @@ impl SearchEngine for Search {
let mut stream = match first_attempt {
Ok(stream) => stream,
- Err(err) if self.settings.daemon.autostart && Self::should_retry(&err) => {
- debug!("daemon not available, attempting auto-start");
- self.client = None;
-
- daemon::ensure_daemon_running(&self.settings).await?;
-
- let client = self.get_client().await?;
- client
- .search(
- query.clone(),
- query_id,
- state.filter_mode,
- Some(state.context.clone()),
- )
- .await?
- }
Err(err) => return Err(err),
};