wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-09-20 19:27:22 +03:00
Code Issues Projects Releases Wiki Activity

fix: wezterm cli --no_auto_start switch had no effect

Browse Source 
I upgraded Rust and it told me this field of the args
was never read; this commit plumbs that through!
This commit is contained in:
Wez Furlong 2021-12-10 08:14:05 -07:00
parent 852e88a3cc
commit f11f2c72a3
4 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.md
View File

@ -26,6 +26,7 @@ As features stabilize some brief notes about them will accumulate here.
* DECSTR (terminal soft reset) now turns off DECLRMM (left and right margin mode). Thanks to [@ninjalj](https://github.com/ninjalj)! [#1376](https://github.com/wez/wezterm/pull/1376)
* Improved conformance of CUP, HVP, SLRM, STBM escape sequences by support empty first parameter. Thanks to [@ninjalj](https://github.com/ninjalj)! [#1377](https://github.com/wez/wezterm/pull/1377)
* tab bar didn't correctly handle double-wide cells and could truncate at edges when using `format-tab-title` [#1371](https://github.com/wez/wezterm/issues/1371)
* `wezterm cli --no-auto-start` was not respected
### 20211205-192649-672c1cc1

35
wezterm-client/src/client.rs
View File

@ -402,9 +402,16 @@ impl Reconnectable {
}
}
fn connect(&mut self, initial: bool, ui: &mut ConnectionUI) -> anyhow::Result<()> {
fn connect(
&mut self,
initial: bool,
ui: &mut ConnectionUI,
no_auto_start: bool,
) -> anyhow::Result<()> {
match self.config.clone() {
ClientDomainConfig::Unix(unix_dom) => self.unix_connect(unix_dom, initial, ui),
ClientDomainConfig::Unix(unix_dom) => {
self.unix_connect(unix_dom, initial, ui, no_auto_start)
}
ClientDomainConfig::Tls(tls) => self.tls_connect(tls, initial, ui),
ClientDomainConfig::Ssh(ssh) => self.ssh_connect(ssh, initial, ui),
}
@ -515,6 +522,7 @@ impl Reconnectable {
unix_dom: UnixDomain,
initial: bool,
ui: &mut ConnectionUI,
no_auto_start: bool,
) -> anyhow::Result<()> {
let sock_path = unix_dom.socket_path();
ui.output_str(&format!("Connect to {}\n", sock_path.display()));
@ -523,7 +531,7 @@ impl Reconnectable {
let stream = match unix_connect_with_retry(&sock_path, false) {
Ok(stream) => stream,
Err(e) => {
if unix_dom.no_serve_automatically || !initial {
if no_auto_start || unix_dom.no_serve_automatically || !initial {
bail!("failed to connect to {}: {}", sock_path.display(), e);
}
log::warn!(
@ -849,7 +857,9 @@ impl Client {
backoff,
)
.ok();
match reconnectable.connect(false, &mut ui) {
let initial = false;
let no_auto_start = true; // Don't auto-start on a reconnect
match reconnectable.connect(initial, &mut ui, no_auto_start) {
Ok(_) => {
backoff = BASE_INTERVAL;
log::error!("Reconnected!");
@ -942,7 +952,11 @@ impl Client {
self.local_domain_id
}
pub fn new_default_unix_domain(initial: bool, ui: &mut ConnectionUI) -> anyhow::Result<Self> {
pub fn new_default_unix_domain(
initial: bool,
ui: &mut ConnectionUI,
no_auto_start: bool,
) -> anyhow::Result<Self> {
let config = configuration();
let unix_dom = match std::env::var_os("WEZTERM_UNIX_SOCKET") {
@ -962,7 +976,7 @@ impl Client {
.clone(),
};
Self::new_unix_domain(alloc_domain_id(), &unix_dom, initial, ui)
Self::new_unix_domain(alloc_domain_id(), &unix_dom, initial, ui, no_auto_start)
}
pub fn new_unix_domain(
@ -970,10 +984,11 @@ impl Client {
unix_dom: &UnixDomain,
initial: bool,
ui: &mut ConnectionUI,
no_auto_start: bool,
) -> anyhow::Result<Self> {
let mut reconnectable =
Reconnectable::new(ClientDomainConfig::Unix(unix_dom.clone()), None);
reconnectable.connect(initial, ui)?;
reconnectable.connect(initial, ui, no_auto_start)?;
Ok(Self::new(local_domain_id, reconnectable))
}
@ -984,7 +999,8 @@ impl Client {
) -> anyhow::Result<Self> {
let mut reconnectable =
Reconnectable::new(ClientDomainConfig::Tls(tls_client.clone()), None);
reconnectable.connect(true, ui)?;
let no_auto_start = true;
reconnectable.connect(true, ui, no_auto_start)?;
Ok(Self::new(local_domain_id, reconnectable))
}
@ -994,7 +1010,8 @@ impl Client {
ui: &mut ConnectionUI,
) -> anyhow::Result<Self> {
let mut reconnectable = Reconnectable::new(ClientDomainConfig::Ssh(ssh_dom.clone()), None);
reconnectable.connect(true, ui)?;
let no_auto_start = true;
reconnectable.connect(true, ui, no_auto_start)?;
Ok(Self::new(local_domain_id, reconnectable))
}

9
wezterm-client/src/domain.rs
View File

@ -484,7 +484,14 @@ impl Domain for ClientDomain {
let client = spawn_into_new_thread(move || match &config {
ClientDomainConfig::Unix(unix) => {
let initial = true;
Client::new_unix_domain(domain_id, unix, initial, &mut cloned_ui)
let no_auto_start = false;
Client::new_unix_domain(
domain_id,
unix,
initial,
&mut cloned_ui,
no_auto_start,
)
}
ClientDomainConfig::Tls(tls) => Client::new_tls(domain_id, tls, &mut cloned_ui),
ClientDomainConfig::Ssh(ssh) => Client::new_ssh(domain_id, ssh, &mut cloned_ui),

2
wezterm/src/main.rs
View File

@ -371,7 +371,7 @@ fn delegate_to_gui(saver: UmaskSaver) -> anyhow::Result<()> {
async fn run_cli_async(config: config::ConfigHandle, cli: CliCommand) -> anyhow::Result<()> {
let initial = true;
let mut ui = mux::connui::ConnectionUI::new_headless();
let client = Client::new_default_unix_domain(initial, &mut ui)?;
let client = Client::new_default_unix_domain(initial, &mut ui, cli.no_auto_start)?;
match cli.sub {
CliSubCommand::List => {
let cols = vec![