From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH installer v2 6/8] tui: install_progress: handle errors in ui message loop more gracefully
Date: Fri, 10 Nov 2023 15:17:24 +0100 [thread overview]
Message-ID: <20231110141727.597039-7-c.heiss@proxmox.com> (raw)
In-Reply-To: <20231110141727.597039-1-c.heiss@proxmox.com>
This at least gives _some_ feedback to the user he can potentially
report or try to address, instead of a single, hardcoded message.
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
Changes v1 -> v2:
* no changes
.../src/views/install_progress.rs | 33 +++++++++++++------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/proxmox-tui-installer/src/views/install_progress.rs b/proxmox-tui-installer/src/views/install_progress.rs
index fceb785..96e62f8 100644
--- a/proxmox-tui-installer/src/views/install_progress.rs
+++ b/proxmox-tui-installer/src/views/install_progress.rs
@@ -75,29 +75,36 @@ impl InstallProgressView {
};
let inner = || {
- let reader = child.stdout.take().map(BufReader::new)?;
- let mut writer = child.stdin.take()?;
+ let reader = child
+ .stdout
+ .take()
+ .map(BufReader::new)
+ .ok_or("failed to get stdin reader")?;
- serde_json::to_writer(&mut writer, &InstallConfig::from(state.options)).unwrap();
- writeln!(writer).unwrap();
+ let mut writer = child.stdin.take().ok_or("failed to get stdin writer")?;
+
+ serde_json::to_writer(&mut writer, &InstallConfig::from(state.options))
+ .map_err(|err| format!("failed to serialize install config: {err}"))?;
+ writeln!(writer).map_err(|err| format!("failed to write install config: {err}"))?;
let writer = Arc::new(Mutex::new(writer));
for line in reader.lines() {
let line = match line {
Ok(line) => line,
- Err(_) => break,
+ Err(err) => return Err(format!("low-level installer exited early: {err}")),
};
let msg = match line.parse::<UiMessage>() {
Ok(msg) => msg,
Err(stray) => {
+ // Not a fatal error, so don't abort the installation by returning
eprintln!("low-level installer: {stray}");
continue;
}
};
- match msg {
+ let result = match msg.clone() {
UiMessage::Info(s) => cb_sink.send(Box::new(|siv| {
siv.add_layer(Dialog::info(s).title("Information"));
})),
@@ -120,18 +127,23 @@ impl InstallProgressView {
Self::prepare_for_reboot(siv, success, &msg)
}))
}
+ };
+
+ if let Err(err) = result {
+ eprintln!("error during message handling: {err}");
+ eprintln!(" message was: '{msg:?}");
}
- .unwrap();
}
- Some(())
+ Ok(())
};
- if inner().is_none() {
+ if let Err(err) = inner() {
+ let message = format!("installation failed: {err}");
cb_sink
.send(Box::new(|siv| {
siv.add_layer(
- Dialog::text("low-level installer exited early")
+ Dialog::text(message)
.title("Error")
.button("Exit", Cursive::quit),
);
@@ -194,6 +206,7 @@ impl ViewWrapper for InstallProgressView {
cursive::wrap_impl!(self.view: PaddedView<LinearLayout>);
}
+#[derive(Clone, Debug)]
enum UiMessage {
Info(String),
Error(String),
--
2.42.0
next prev parent reply other threads:[~2023-11-10 14:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-10 14:17 [pve-devel] [PATCH installer v2 0/8] refactor and improve installation progress Christoph Heiss
2023-11-10 14:17 ` [pve-devel] [PATCH installer v2 1/8] tui: move install progress dialog into own view module Christoph Heiss
2023-11-10 14:17 ` [pve-devel] [PATCH installer v2 2/8] tui: install_progress: move progress task into own function Christoph Heiss
2023-11-10 14:17 ` [pve-devel] [PATCH installer v2 3/8] tui: install_progress: split out low-level installer spawing " Christoph Heiss
2023-11-10 14:17 ` [pve-devel] [PATCH installer v2 4/8] tui: install_progress: split out reboot handling " Christoph Heiss
2023-11-10 14:17 ` [pve-devel] [PATCH installer v2 5/8] tui: install_progress: split out prompt logic " Christoph Heiss
2023-11-10 14:17 ` Christoph Heiss [this message]
2023-11-10 14:17 ` [pve-devel] [PATCH installer v2 7/8] low-level: avoid open-coding config reading, parsing and merging Christoph Heiss
2023-11-10 14:17 ` [pve-devel] [PATCH installer v2 8/8] low-level, tui: count down auto-reboot timeout Christoph Heiss
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231110141727.597039-7-c.heiss@proxmox.com \
--to=c.heiss@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox