From: "Dominic Jäger" <d.jaeger@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager] vzdump mail: fix #3136: Add name to plain/text part
Date: Mon, 16 Nov 2020 10:44:11 +0100 [thread overview]
Message-ID: <20201116094411.45477-1-d.jaeger@proxmox.com> (raw)
The html/text part already has VMID NAME STATUS TIME..., but the text part only
had VMID STATUS TIME... so far. Therefore, add the missing "name" column.
Limit the length of names so that the content of the following columns remains
aligned to the headings. Note that (like before, too) this only works with
monospaced fonts.
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
---
Unfortunately, I had no idea for non-monospaced fonts yet.
PVE/VZDump.pm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 517becb1..1096d594 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -258,18 +258,20 @@ sub sendmail {
# text part
my $text = $err ? "$err\n\n" : '';
- $text .= sprintf ("%-10s %-6s %10s %10s %s\n", qw(VMID STATUS TIME SIZE FILENAME));
+ $text .= sprintf ("%-10s %-20s %-6s %10s %10s %s\n", qw(VMID NAME STATUS TIME SIZE FILENAME));
foreach my $task (@$tasklist) {
my $vmid = $task->{vmid};
if ($task->{state} eq 'ok') {
- $text .= sprintf ("%-10s %-6s %10s %10s %s\n", $vmid,
+ $text .= sprintf ("%-10s %-20s %-6s %10s %10s %s\n", $vmid,
+ substr($task->{hostname}, 0, 20),
$task->{state},
format_time($task->{backuptime}),
format_size ($task->{size}),
$task->{target});
} else {
- $text .= sprintf ("%-10s %-6s %10s %8.2fMB %s\n", $vmid,
+ $text .= sprintf ("%-10s %-20s %-6s %10s %8.2fMB %s\n", $vmid,
+ substr($task->{hostname}, 0, 20),
$task->{state},
format_time($task->{backuptime}),
0, '-');
--
2.20.1
next reply other threads:[~2020-11-16 9:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-16 9:44 Dominic Jäger [this message]
2020-11-16 17:06 ` [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=20201116094411.45477-1-d.jaeger@proxmox.com \
--to=d.jaeger@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