Skip to content

Commit

Permalink
fix(cli): do not exit mobile dev if logger could not be attached (#10790
Browse files Browse the repository at this point in the history
)

I just faced this when I was connected to my iPhone but wireless. Xcode also lets this happen, you only miss the logs in this case.
  • Loading branch information
lucasfernog authored Aug 27, 2024
1 parent 84070ba commit 83ed090
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 16 deletions.
6 changes: 6 additions & 0 deletions .changes/do-not-exit-on-log-fail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"tauri-cli": patch:bug
"@tauri-apps/cli": patch:bug
---

Do not quit `ios dev` and `android dev` process when we fail to attach the logger.
9 changes: 1 addition & 8 deletions tooling/cli/src/mobile/android/dev.rs
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,6 @@ fn run_dev(
)?;

let open = options.open;
let exit_on_panic = options.exit_on_panic;
let no_watch = options.no_watch;
interface.mobile_dev(
MobileOptions {
debug: !options.release_mode,
Expand Down Expand Up @@ -247,12 +245,7 @@ fn run_dev(
open_and_wait(config, &env)
} else if let Some(device) = &device {
match run(device, options, config, &env, metadata, noise_level) {
Ok(c) => {
crate::dev::wait_dev_process(c.clone(), move |status, reason| {
crate::dev::on_app_exit(status, reason, exit_on_panic, no_watch)
});
Ok(Box::new(c) as Box<dyn DevProcess + Send>)
}
Ok(c) => Ok(Box::new(c) as Box<dyn DevProcess + Send>),
Err(e) => {
crate::dev::kill_before_dev_process();
Err(e)
Expand Down
9 changes: 1 addition & 8 deletions tooling/cli/src/mobile/ios/dev.rs
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,6 @@ fn run_dev(
let set_host = options.host.is_some();

let open = options.open;
let exit_on_panic = options.exit_on_panic;
let no_watch = options.no_watch;
interface.mobile_dev(
MobileOptions {
debug: true,
Expand Down Expand Up @@ -401,12 +399,7 @@ fn run_dev(
open_and_wait(config, &env)
} else if let Some(device) = &device {
match run(device, options, config, &env) {
Ok(c) => {
crate::dev::wait_dev_process(c.clone(), move |status, reason| {
crate::dev::on_app_exit(status, reason, exit_on_panic, no_watch)
});
Ok(Box::new(c) as Box<dyn DevProcess + Send>)
}
Ok(c) => Ok(Box::new(c) as Box<dyn DevProcess + Send>),
Err(e) => {
crate::dev::kill_before_dev_process();
Err(e)
Expand Down

0 comments on commit 83ed090

Please sign in to comment.