public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [RFC v2 container 1/1] print_ct_warn_log: use log_warn function from RESTEnvironment
Date: Fri, 29 Oct 2021 13:16:24 +0200	[thread overview]
Message-ID: <20211029111624.142116-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20211029111624.142116-1-f.ebner@proxmox.com>

No functional change is intended.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---

No changes from v1.

Dependency bump for pve-common is needed.

 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 b07d986..aed20a3 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);
@@ -2306,13 +2306,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





  parent reply	other threads:[~2021-10-29 11:17 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-29 11:16 [pve-devel] [RFC v2 common 1/2] REST environment: add static log_warn function Fabian Ebner
2021-10-29 11:16 ` [pve-devel] [RFC v2 common 2/2] REST environment: allow export of log_warn Fabian Ebner
2022-03-04 10:33   ` [pve-devel] applied: " Thomas Lamprecht
2021-10-29 11:16 ` Fabian Ebner [this message]
2022-03-04 10:25   ` [pve-devel] [RFC v2 container 1/1] print_ct_warn_log: use log_warn function from RESTEnvironment Thomas Lamprecht
2022-03-04 10:32     ` Fabian Ebner
2022-03-04 10:40       ` Thomas Lamprecht
2022-12-14  8:23   ` Fiona Ebner
2022-12-14 11:14   ` [pve-devel] applied: " Thomas Lamprecht
2022-02-16  7:34 ` [pve-devel] [RFC v2 common 1/2] REST environment: add static log_warn function Fabian Ebner
2022-03-04 10:40 ` [pve-devel] applied: " 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=20211029111624.142116-3-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal