all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Lorenz Stechauner <l.stechauner@proxmox.com>
To: Thomas Lamprecht <t.lamprecht@proxmox.com>,
	Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH v8 common 2/2] tools: download_file_from_url: adapt error messages to start at new line
Date: Wed, 16 Jun 2021 10:46:14 +0200	[thread overview]
Message-ID: <3ea39263-1b5a-04f1-99eb-a412200c17d3@proxmox.com> (raw)
In-Reply-To: <7d42279c-2ca1-84d6-5256-e0aae41f47c4@proxmox.com>


On 15.06.21 16:23, Thomas Lamprecht wrote:
> On 15.06.21 16:08, Lorenz Stechauner wrote:
>> the front end expects the error message to be the first part of the
>> last line.
>> ---
>>   src/PVE/Tools.pm | 10 ++++++----
>>   1 file changed, 6 insertions(+), 4 deletions(-)
>>
>> diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
>> index c90810c..c02c259 100644
>> --- a/src/PVE/Tools.pm
>> +++ b/src/PVE/Tools.pm
>> @@ -1869,11 +1869,12 @@ sub download_file_from_url {
>>   	    my $checksum_got = get_file_hash($checksum_algorithm, $dest);
>>   
>>   	    if (lc($checksum_got) eq lc($checksum_expected)) {
>> -		print "OK, got correct file already, no need to download\n";
>> +		print " OK, got correct file already, no need to download\n";
> this was done by design, as there's a ".." before that
>
>>   		return;
>>   	    } else {
>> +		print "\n";
>>   		# we could re-download, but may not be safe so just abort for now..
>> -		die "mismatch (got '$checksum_got' != expect '$checksum_expected'), aborting\n";
>> +		die "checksum mismatch: got '$checksum_got' != expect '$checksum_expected', aborting\n";
> ok, slightly nicer
>
>>   	    }
>>   	}
>>   
>> @@ -1906,9 +1907,10 @@ sub download_file_from_url {
>>   	    my $checksum_got = get_file_hash($checksum_algorithm, $tmpdest);
>>   
>>   	    if (lc($checksum_got) eq lc($checksum_expected)) {
>> -		print "OK, checksum verified\n";
>> +		print " OK, checksum verified\n";
> as above, the previous print has a ".." at the end so I left any whitespace out.
>
>>   	    } else {
>> -		die "ERROR, checksum mismatch: got '$checksum_got' != expect '$checksum_expected'\n";
>> +		print "\n";
> If, we could just include the "\n" in the start of the die, but we do not really
> add such newlines for separating errors in general in task logs, so I'd rather
> leave this one out.

The new line at the beginning of die does not work either :(

calculating checksum of existing file...TASK ERROR:  checksum mismatch: 
got '73e74eef3d998d522f92295016d92fdc' != expect 'asdf', aborting

The new line was converted to an additional space and the message was 
prefixed with "TASK ERROR: "

The only way I can come up with to make this work for the frontend, is 
to use a print statement before the die...

>
>> +		die "checksum mismatch: got '$checksum_got' != expect '$checksum_expected'\n";
>
>
>>   	    }
>>   	}
>>   
>>




  reply	other threads:[~2021-06-16  8:46 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-15 14:08 [pve-devel] [PATCH-SERIES v8 manager/common/storage] fix #1710: add download from url button Lorenz Stechauner
2021-06-15 14:08 ` [pve-devel] [PATCH v8 common 1/2] tools: download_file_from_url: fix typo Lorenz Stechauner
2021-06-15 14:24   ` [pve-devel] applied: " Thomas Lamprecht
2021-06-15 14:08 ` [pve-devel] [PATCH v8 common 2/2] tools: download_file_from_url: adapt error messages to start at new line Lorenz Stechauner
2021-06-15 14:23   ` Thomas Lamprecht
2021-06-16  8:46     ` Lorenz Stechauner [this message]
2021-06-16  8:48       ` Thomas Lamprecht
2021-06-15 14:08 ` [pve-devel] [PATCH v8 storage 1/1] status: add download_url method Lorenz Stechauner
2021-06-15 14:08 ` [pve-devel] [PATCH v8 manager 1/5] api: nodes: add query_url_metadata method Lorenz Stechauner
2021-06-15 14:08 ` [pve-devel] [PATCH v8 manager 2/5] api: nodes: refactor aplinfo to use common download function Lorenz Stechauner
2021-06-15 14:08 ` [pve-devel] [PATCH v8 manager 3/5] ui: add HashAlgorithmSelector Lorenz Stechauner
2021-06-15 14:08 ` [pve-devel] [PATCH v8 manager 4/5] ui: Utils: change download task format Lorenz Stechauner
2021-06-15 14:08 ` [pve-devel] [PATCH v8 manager 5/5] fix #1710: ui: storage: add download from url button Lorenz Stechauner

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=3ea39263-1b5a-04f1-99eb-a412200c17d3@proxmox.com \
    --to=l.stechauner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    --cc=t.lamprecht@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal