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 B8152941CB for ; Fri, 9 Feb 2024 11:57:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 99E8E37A7F for ; Fri, 9 Feb 2024 11:56:35 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 9 Feb 2024 11:56:34 +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 37A844665E for ; Fri, 9 Feb 2024 11:56:34 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Fri, 9 Feb 2024 11:55:59 +0100 Message-ID: <20240209105629.285910-3-c.heiss@proxmox.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240209105629.285910-1-c.heiss@proxmox.com> References: <20240209105629.285910-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [command.pm] Subject: [pve-devel] [PATCH installer 2/4] sys: command: allow terminating the process early from log subroutine X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Feb 2024 10:57:05 -0000 This is done in a entirely backwards-compatible way, i.e. existing usages don't need any modification. Signed-off-by: Christoph Heiss --- Proxmox/Sys/Command.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Proxmox/Sys/Command.pm b/Proxmox/Sys/Command.pm index c3e24b3..bf67b27 100644 --- a/Proxmox/Sys/Command.pm +++ b/Proxmox/Sys/Command.pm @@ -114,7 +114,14 @@ sub run_command { $logout .= $buf; while ($logout =~ s/^([^\010\r\n]*)(\r|\n|(\010)+|\r\n)//s) { my $line = $1; - $func->($line) if $func; + if ($func) { + my $ret = $func->($line); + if (defined($ret) && $ret == 1) { + kill('KILL', $pid); + waitpid($pid, 0); + return $ostream; + } + }; } } elsif ($h eq $error) { -- 2.43.0