From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 1/2] termproxy: let users stop the termproxy task
Date: Thu, 23 Jul 2020 15:20:12 +0200 [thread overview]
Message-ID: <20200723132013.22398-1-d.csapak@proxmox.com> (raw)
for that we have to do a select on the workers abort_future
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/node.rs | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/api2/node.rs b/src/api2/node.rs
index 431627c..b572a9c 100644
--- a/src/api2/node.rs
+++ b/src/api2/node.rs
@@ -4,7 +4,7 @@ use std::os::unix::io::AsRawFd;
use anyhow::{bail, format_err, Error};
use futures::{
future::{FutureExt, TryFutureExt},
- try_join,
+ select,
};
use hyper::body::Body;
use hyper::http::request::Parts;
@@ -169,9 +169,10 @@ async fn termproxy(
let mut cmd = tokio::process::Command::new("/usr/bin/termproxy");
- cmd.args(&arguments);
- cmd.stdout(std::process::Stdio::piped());
- cmd.stderr(std::process::Stdio::piped());
+ cmd.args(&arguments)
+ .kill_on_drop(true)
+ .stdout(std::process::Stdio::piped())
+ .stderr(std::process::Stdio::piped());
let mut child = cmd.spawn().expect("error executing termproxy");
@@ -184,7 +185,7 @@ async fn termproxy(
while let Some(line) = reader.next_line().await? {
worker_stdout.log(line);
}
- Ok(())
+ Ok::<(), Error>(())
};
let worker_stderr = worker.clone();
@@ -193,18 +194,24 @@ async fn termproxy(
while let Some(line) = reader.next_line().await? {
worker_stderr.warn(line);
}
- Ok(())
+ Ok::<(), Error>(())
};
- let (exit_code, _, _) = try_join!(child, stdout_fut, stderr_fut)?;
- if !exit_code.success() {
- match exit_code.code() {
- Some(code) => bail!("termproxy exited with {}", code),
- None => bail!("termproxy exited by signal"),
- }
+ select!{
+ res = child.fuse() => {
+ let exit_code = res?;
+ if !exit_code.success() {
+ match exit_code.code() {
+ Some(code) => bail!("termproxy exited with {}", code),
+ None => bail!("termproxy exited by signal"),
+ }
+ }
+ Ok(())
+ },
+ res = stdout_fut.fuse() => res,
+ res = stderr_fut.fuse() => res,
+ res = worker.abort_future().fuse() => res.map_err(Error::from),
}
-
- Ok(())
},
)?;
--
2.20.1
next reply other threads:[~2020-07-23 13:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-23 13:20 Dominik Csapak [this message]
2020-07-23 13:20 ` [pbs-devel] [RFC PATCH proxmox-backup 2/2] server/state: add spawn_internal_task and use it for websockets Dominik Csapak
2020-07-24 7:29 ` Dietmar Maurer
2020-07-24 7:35 ` Dominik Csapak
2020-07-24 7:37 ` [pbs-devel] [PATCH proxmox-backup 1/2] termproxy: let users stop the termproxy task Dominik Csapak
2020-07-24 10:13 ` [pbs-devel] applied-series: " Thomas Lamprecht
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=20200723132013.22398-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-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