mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-24 15:18:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

remote dev: Always upload binary in development mode (#19953)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Thorsten Ball 2024-10-30 13:41:28 +01:00 committed by GitHub
parent f6cd97f6fd
commit 0ba40bdfb8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1736,13 +1736,19 @@ impl SshRemoteConnection {
}
}
if self.is_binary_in_use(dst_path).await? {
log::info!("server binary is opened by another process. not updating");
delegate.set_status(
Some("Skipping update of remote development server, since it's still in use"),
cx,
);
return Ok(());
if cfg!(not(debug_assertions)) {
// When we're not in dev mode, we don't want to switch out the binary if it's
// still open.
// In dev mode, that's fine, since we often kill Zed processes with Ctrl-C and want
// to still replace the binary.
if self.is_binary_in_use(dst_path).await? {
log::info!("server binary is opened by another process. not updating");
delegate.set_status(
Some("Skipping update of remote development server, since it's still in use"),
cx,
);
return Ok(());
}
}
let upload_binary_over_ssh = self.socket.connection_options.upload_binary_over_ssh;