From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4AFA56764F for ; Tue, 12 Jan 2021 14:58:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 492F726F34 for ; Tue, 12 Jan 2021 14:58:41 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DA2CE26F2A for ; Tue, 12 Jan 2021 14:58:40 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A6D6145F58 for ; Tue, 12 Jan 2021 14:58:40 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Tue, 12 Jan 2021 14:58:20 +0100 Message-Id: <20210112135830.2798301-11-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210112135830.2798301-1-f.gruenbichler@proxmox.com> References: <20210112135830.2798301-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [node.rs] Subject: [pbs-devel] [PATCH proxmox-backup 06/12] tokio: adapt to 1.0 process:Child changes X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2021 13:58:41 -0000 Child itself is no longer a Future, but it has a new wait() async fn that does the same thing Signed-off-by: Fabian Grünbichler --- src/api2/node.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/api2/node.rs b/src/api2/node.rs index b1a25e0e..51dfdd19 100644 --- a/src/api2/node.rs +++ b/src/api2/node.rs @@ -197,7 +197,7 @@ async fn termproxy( let mut needs_kill = false; let res = tokio::select!{ - res = &mut child => { + res = child.wait() => { let exit_code = res?; if !exit_code.success() { match exit_code.code() { @@ -217,14 +217,13 @@ async fn termproxy( if needs_kill { if res.is_ok() { - child.kill()?; - child.await?; + child.kill().await?; return Ok(()); } - if let Err(err) = child.kill() { + if let Err(err) = child.kill().await { worker.warn(format!("error killing termproxy: {}", err)); - } else if let Err(err) = child.await { + } else if let Err(err) = child.wait().await { worker.warn(format!("error awaiting termproxy: {}", err)); } } -- 2.20.1