yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PVE::API2::Storage::Replication->jobs(): return array

Browse Source
This commit is contained in:
Dietmar Maurer
2017-05-05 10:54:10 +02:00
parent e0992d57e1
commit 339ca30a5b
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/API2/Storage/Replication.pm
View File

@ -55,11 +55,20 @@ __PACKAGE__->register_method ({
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
}, },
}, },
returns => { type => 'object' }, returns => {
type => 'array',
items => {
type => "object",
properties => {},
},
links => [ { rel => 'child', href => "{vmid}" } ],
},
code => sub { code => sub {
my ($param) = @_; my ($param) = @_;
return PVE::ReplicationTools::get_all_jobs(); my $jobs = PVE::ReplicationTools::get_all_jobs();
return PVE::RESTHandler::hash_to_array($jobs, 'vmid');
}}); }});
1; 1;

8
PVE/CLI/pvesr.pm
View File

@ -22,16 +22,16 @@ sub setup_environment {
} }
my $print_job_list = sub { my $print_job_list = sub {
my ($conf) = @_; my ($list) = @_;
printf("%-10s%-20s%-20s%-5s%-10s%-5s\n", printf("%-10s%-20s%-20s%-5s%-10s%-5s\n",
"VMID", "DEST", "LAST SYNC","IVAL", "STATE", "FAIL"); "VMID", "DEST", "LAST SYNC","IVAL", "STATE", "FAIL");
foreach my $vmid (sort keys %$conf) { foreach my $job (sort { $a->{vmid} <=> $b->{vmid} } @$list) {
my $job = $conf->{$vmid};
my $timestr = strftime("%Y-%m-%d_%H:%M:%S", localtime($job->{lastsync})); my $timestr = strftime("%Y-%m-%d_%H:%M:%S", localtime($job->{lastsync}));
printf("%-9s ", $vmid); printf("%-9s ", $job->{vmid});
printf("%-19s ", $job->{tnode}); printf("%-19s ", $job->{tnode});
printf("%-19s ", $timestr); printf("%-19s ", $timestr);
printf("%-4s ", $job->{interval}); printf("%-4s ", $job->{interval});