proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-05-21 21:07:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

report: avoid adding to report by side-effects, be more explicit

Browse Source 
And move the helper methods up and scope them to module-local only

Uses the fact that perl methods return the last statement, so the
dir2text sub closures in the command list do not need to be changed

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-05-11 14:28:46 +02:00
parent 73cdcc98be
commit 3a0b2c40d2
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
PVE/Report.pm
View File

@ -5,6 +5,21 @@ use warnings;
use PVE::Tools; use PVE::Tools;
# output the content of all the files of a directory
my sub dir2text {
my ($target_dir, $regexp) = @_;
my $text = '';
PVE::Tools::dir_glob_foreach($target_dir, $regexp, sub {
my ($file) = @_;
$text .= "\n# cat $target_dir$file\n";
$text .= PVE::Tools::file_get_contents($target_dir.$file)."\n";
});
return $text;
}
# command -v is the posix equivalent of 'which'
my sub cmd_exists { system("command -v '$_[0]' > /dev/null 2>&1") == 0 }
my $init_report_cmds = sub { my $init_report_cmds = sub {
# NOTE: always add new sections to the report_order array! # NOTE: always add new sections to the report_order array!
@ -106,29 +121,13 @@ my $init_report_cmds = sub {
return $report_def; return $report_def;
}; };
my $report;
# output the content of all the files of a directory
sub dir2text {
my ($target_dir, $regexp) = @_;
PVE::Tools::dir_glob_foreach($target_dir, $regexp, sub {
my ($file) = @_;
$report .= "\n# cat $target_dir$file\n";
$report .= PVE::Tools::file_get_contents($target_dir.$file)."\n";
});
}
# command -v is the posix equivalent of 'which'
sub cmd_exists { system("command -v '$_[0]' > /dev/null 2>&1") == 0 }
sub generate { sub generate {
my $report_def = $init_report_cmds->(); my $report_def = $init_report_cmds->();
my @report_order = ('general', 'storage', 'virtual guests', 'network', my @report_order = ('general', 'storage', 'virtual guests', 'network',
'firewall', 'cluster', 'bios', 'pci', 'disks', 'volumes'); 'firewall', 'cluster', 'bios', 'pci', 'disks', 'volumes');
$report = ''; my $report = '';
my $record_output = sub { my $record_output = sub {
$report .= shift . "\n"; $report .= shift . "\n";
}; };
@ -160,7 +159,7 @@ sub generate {
foreach my $command (@$commands) { foreach my $command (@$commands) {
eval { eval {
if (ref $command eq 'CODE') { if (ref $command eq 'CODE') {
PVE::Tools::run_with_timeout($cmd_timeout, $command); $report .= PVE::Tools::run_with_timeout($cmd_timeout, $command);
} else { } else {
print STDERR "Process ".$command."..."; print STDERR "Process ".$command."...";
$report .= "\n# $command\n"; $report .= "\n# $command\n";