public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 3/5] metrics: influx: do not error out when credendtials could not be loaded
Date: Mon, 15 Mar 2021 09:14:55 +0100	[thread overview]
Message-ID: <20210315081457.3543519-3-t.lamprecht@proxmox.com> (raw)
In-Reply-To: <20210315081457.3543519-1-t.lamprecht@proxmox.com>

Not a hard error, some network box (proxy) down the line could add it
for us, or it could be just not required, so ...

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 PVE/Status/InfluxDB.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/PVE/Status/InfluxDB.pm b/PVE/Status/InfluxDB.pm
index 712a30ff..137aec1b 100644
--- a/PVE/Status/InfluxDB.pm
+++ b/PVE/Status/InfluxDB.pm
@@ -208,7 +208,7 @@ sub test_connection {
 	my $ua = LWP::UserAgent->new();
 	$ua->timeout($cfg->{timeout} // 1);
 	# in the initial add connection test, the token may still be in $cfg
-	my $token = $cfg->{token} // get_credentials($id);
+	my $token = $cfg->{token} // get_credentials($id, 1);
 	if (defined($token)) {
 	    $ua->default_header("Authorization" => "Token $token");
 	}
@@ -330,11 +330,14 @@ sub set_credentials {
 }
 
 sub get_credentials {
-    my ($id) = @_;
+    my ($id, $silent) = @_;
 
     my $cred_file = cred_file_name($id);
 
-    return PVE::Tools::file_get_contents($cred_file);
+    my $creds = eval { PVE::Tools::file_get_contents($cred_file) };
+    warn "could not load credentials for '$id': $@\n" if $@ && !$silent;
+
+    return $creds;
 }
 
 sub on_add_hook {
-- 
2.29.2





  parent reply	other threads:[~2021-03-15  8:15 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-15  8:14 [pve-devel] [PATCH manager 1/5] metrics: influx: include unrecognized protocol value in error Thomas Lamprecht
2021-03-15  8:14 ` [pve-devel] [PATCH manager 2/5] metrics: influx: send along auth token on connection test too Thomas Lamprecht
2021-03-15  8:14 ` Thomas Lamprecht [this message]
2021-03-15  8:14 ` [pve-devel] [PATCH manager 4/5] metrics: influx: allow one to add an API URL-path prefix Thomas Lamprecht
2021-03-15  8:14 ` [pve-devel] [PATCH manager 5/5] ui: metrics: influxdb: add support for new api-path-prefix field Thomas Lamprecht
2021-03-15 14:32 ` [pve-devel] applied-series: [PATCH manager 1/5] metrics: influx: include unrecognized protocol value in error Dominik Csapak
2021-03-15 15:04   ` 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=20210315081457.3543519-3-t.lamprecht@proxmox.com \
    --to=t.lamprecht@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