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 7159A95976 for ; Thu, 19 Jan 2023 10:13:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 460CF29939 for ; Thu, 19 Jan 2023 10:12:41 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 19 Jan 2023 10:12: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 DAF0743EA9 for ; Thu, 19 Jan 2023 10:12:39 +0100 (CET) Message-ID: Date: Thu, 19 Jan 2023 10:12:39 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Thunderbird/109.0 Content-Language: en-GB To: Proxmox Backup Server development discussion , =?UTF-8?Q?Fabian_Gr=C3=BCnbichler?= References: <20230118135342.1226289-1-f.gruenbichler@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20230118135342.1226289-1-f.gruenbichler@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL -0.037 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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. [task.rs, proxmox-backup-manager.rs] Subject: [pbs-devel] applied: [PATCH proxmox-backup] fix #4483: fix `task log` command interrupt handling 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: Thu, 19 Jan 2023 09:13:11 -0000 Am 18/01/2023 um 14:53 schrieb Fabian Gr=C3=BCnbichler: > `proxmox-backup-client task log ..` and `proxmox-backup-manager task lo= g ..` > are used to view the logs of tasks that have been started by another cl= ient, so > interrupting the task progress view should not forward the interrupt to= the > running task. other call sites of the same helper(s) that spawn a task = and then > print its progress should keep the old behaviour of interrupting the sp= awned > task on C^c. >=20 > Signed-off-by: Fabian Gr=C3=BCnbichler > --- > pbs-client/src/task_log.rs | 26 +++++++++++++++++--------- > proxmox-backup-client/src/task.rs | 2 +- > src/bin/proxmox-backup-manager.rs | 2 +- > 3 files changed, 19 insertions(+), 11 deletions(-) >=20 > @@ -119,7 +127,7 @@ pub async fn view_task_result( > let data =3D &result["data"]; > if output_format =3D=3D "text" { > if let Some(upid) =3D data.as_str() { > - display_task_log(client, upid, true).await?; > + display_task_log(client, upid, true, true).await?; the calling signature starts to become a bit opaque (mapping multiple boo= leans or other immediate values has some overhead - without fancy LSP that is ;-) But for now still somewhat fine.. applied, thanks!