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 326116C495 for ; Fri, 6 Aug 2021 14:57:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 21D98DF27 for ; Fri, 6 Aug 2021 14:57:17 +0200 (CEST) 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 id 7620ADF15 for ; Fri, 6 Aug 2021 14:57:16 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3ED2342EF0 for ; Fri, 6 Aug 2021 14:57:16 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 6 Aug 2021 14:57:12 +0200 Message-Id: <20210806125712.96863-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210806125712.96863-1-f.ebner@proxmox.com> References: <20210806125712.96863-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.422 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. [lxc.pm] Subject: [pve-devel] [RFC container 1/1] print_ct_warn_log: use log_warn function from RESTEnvironment 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, 06 Aug 2021 12:57:47 -0000 Signed-off-by: Fabian Ebner --- src/PVE/LXC.pm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index dbdec23..85eed65 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -29,11 +29,11 @@ use PVE::Tools qw( $IPV4RE $IPV6RE ); -use PVE::RPCEnvironment; use PVE::CpuSet; use PVE::Network; use PVE::AccessControl; use PVE::ProcFSTools; +use PVE::RESTEnvironment; use PVE::Syscall qw(:fsmount); use PVE::LXC::Config; use PVE::GuestHelpers qw(safe_string_ne safe_num_ne safe_boolean_ne); @@ -2296,13 +2296,8 @@ my sub print_ct_warn_log { my $log = eval { file_get_contents($log_fn) }; return if !$log; - my $rpcenv = eval { PVE::RPCEnvironment::get() }; - - my $warn_fn = $rpcenv ? sub { $rpcenv->warn($_[0]) } : sub { print STDERR "WARN: $_[0]\n" }; - while ($log =~ /^\h*\s*(.*?)\h*$/gm) { - my $line = $1; - $warn_fn->($line); + PVE::RESTEnvironment::log_warn($1); } unlink $log_fn or warn "could not unlink '$log_fn' - $!\n"; } -- 2.30.2