proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-13 15:49:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

apt: try to send updated packe list only once

Browse Source
This commit is contained in:
Dietmar Maurer 2013-08-02 10:03:18 +02:00
parent 23a5d458e2
commit 745d942d91
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
PVE/API2/APT.pm
View File

@ -144,10 +144,28 @@ my $assemble_pkginfo = sub {
# we try to cache results # we try to cache results
my $pve_pkgstatus_fn = "/var/lib/pve-manager/pkgupdates"; my $pve_pkgstatus_fn = "/var/lib/pve-manager/pkgupdates";
my $read_cached_pkgstatus = sub {
my $data = [];
eval {
my $jsonstr = PVE::Tools::file_get_contents($pve_pkgstatus_fn, 5*1024*1024);
$data = decode_json($jsonstr);
};
if (my $err = $@) {
warn "error reading cached package status in $pve_pkgstatus_fn\n";
}
return $data;
};
my $update_pve_pkgstatus = sub { my $update_pve_pkgstatus = sub {
syslog('info', "update new package list: $pve_pkgstatus_fn"); syslog('info', "update new package list: $pve_pkgstatus_fn");
my $notify_status = {};
my $oldpkglist = &$read_cached_pkgstatus();
foreach my $pi (@$oldpkglist) {
$notify_status->{$pi->{Package}} = $pi->{Version};
}
my $pkglist = []; my $pkglist = [];
my $cache = &$get_apt_cache(); my $cache = &$get_apt_cache();
@ -194,6 +212,14 @@ my $update_pve_pkgstatus = sub {
} }
} }
} }
# keep notification status (avoid sending mails abou new packages more than once)
foreach my $pi (@$pkglist) {
if (my $ns = $notify_status->{$pi->{Package}}) {
$pi->{NotifyStatus} = $ns if $ns eq $pi->{Version};
}
}
PVE::Tools::file_set_contents($pve_pkgstatus_fn, encode_json($pkglist)); PVE::Tools::file_set_contents($pve_pkgstatus_fn, encode_json($pkglist));
return $pkglist; return $pkglist;
@ -230,15 +256,7 @@ __PACKAGE__->register_method({
my $st3 = File::stat::stat("/var/lib/dpkg/status"); my $st3 = File::stat::stat("/var/lib/dpkg/status");
if ($st2 && $st3 && $st2->mtime <= $st1->mtime && $st3->mtime <= $st1->mtime) { if ($st2 && $st3 && $st2->mtime <= $st1->mtime && $st3->mtime <= $st1->mtime) {
my $data; if (my $data = &$read_cached_pkgstatus()) {
eval {
my $jsonstr = PVE::Tools::file_get_contents($pve_pkgstatus_fn, 5*1024*1024);
$data = decode_json($jsonstr);
};
if (my $err = $@) {
warn "error readin cached package status in $pve_pkgstatus_fn\n";
# continue and overwrite cache with new content
} else {
return $data; return $data;
} }
} }
@ -344,7 +362,12 @@ __PACKAGE__->register_method({
print $fh $data; print $fh $data;
$fh->close(); $fh->close() || die "unable to close 'sendmail' - $!";
foreach my $pi (@$pkglist) {
$pi->{NotifyStatus} = $pi->{Version};
}
PVE::Tools::file_set_contents($pve_pkgstatus_fn, encode_json($pkglist));
} }
} }