mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-04 02:05:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ssh remoting: Emit Disconnected when reconnected exhausted (#19540)

Browse source 
Release Notes:

- N/A

---------

Co-authored-by: Bennet <bennet@zed.dev>
This commit is contained in:
Thorsten Ball 2024-10-22 11:35:27 +02:00 committed by GitHub
parent 4f52077d97
commit 27d1a566d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/remote/src/ssh_session.rs
View file

@ -356,6 +356,10 @@ impl State {
matches!(self, Self::ReconnectExhausted { .. }) matches!(self, Self::ReconnectExhausted { .. })
} }
fn is_server_not_running(&self) -> bool {
matches!(self, Self::ServerNotRunning)
}
fn is_reconnecting(&self) -> bool { fn is_reconnecting(&self) -> bool {
matches!(self, Self::Reconnecting { .. }) matches!(self, Self::Reconnecting { .. })
} }
@ -700,7 +704,6 @@ impl SshRemoteClient {
if this.state_is(State::is_reconnect_failed) { if this.state_is(State::is_reconnect_failed) {
this.reconnect(cx) this.reconnect(cx)
} else if this.state_is(State::is_reconnect_exhausted) { } else if this.state_is(State::is_reconnect_exhausted) {
cx.emit(SshRemoteEvent::Disconnected);
Ok(()) Ok(())
} else { } else {
log::debug!("State has transition from Reconnecting into new state while attempting reconnect."); log::debug!("State has transition from Reconnecting into new state while attempting reconnect.");
@ -870,6 +873,9 @@ impl SshRemoteClient {
let len = child_stderr let len = child_stderr
.read(&mut stderr_buffer[stderr_offset..]) .read(&mut stderr_buffer[stderr_offset..])
.await?; .await?;
if len == 0 {
return Err(anyhow!("stderr is closed"));
}
stderr_offset += len; stderr_offset += len;
let mut start_ix = 0; let mut start_ix = 0;
@ -929,7 +935,6 @@ impl SshRemoteClient {
log::error!("failed to reconnect because server is not running"); log::error!("failed to reconnect because server is not running");
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
this.set_state(State::ServerNotRunning, cx); this.set_state(State::ServerNotRunning, cx);
cx.emit(SshRemoteEvent::Disconnected);
})?; })?;
} }
} }
@ -972,7 +977,14 @@ impl SshRemoteClient {
fn set_state(&self, state: State, cx: &mut ModelContext<Self>) { fn set_state(&self, state: State, cx: &mut ModelContext<Self>) {
log::info!("setting state to '{}'", &state); log::info!("setting state to '{}'", &state);
let is_reconnect_exhausted = state.is_reconnect_exhausted();
let is_server_not_running = state.is_server_not_running();
self.state.lock().replace(state); self.state.lock().replace(state);
if is_reconnect_exhausted || is_server_not_running {
cx.emit(SshRemoteEvent::Disconnected);
}
cx.notify(); cx.notify();
} }