github-featured/webmin--webmin
2
0
Fork 0
Code Issues Pull Requests Deployments Models Agent Notes Packages Projects Releases Wiki Activity

Fix to simplify caching logic to only check for EOL data after Webmin installation/upgrade

Browse Source
This commit is contained in:
Ilia Ross
2024-04-11 20:07:34 +03:00
parent d446c7d3d0
commit 0b21cbdc7c
2 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webmin/change_os.cgi
+2 -2
View File
@@ -34,8 +34,8 @@ if (defined($in{'os_eol_before'}) &&
$in{'os_eol_before'} =~ /^\d+$/ || &error($text{'os_eol_ecountdown'});
$gconfig{'os_eol_before'} = $in{'os_eol_before'};
# Invalidate EOL cache
foreach my $key ('os_eol_none', 'os_eol_expired',
'os_eol_expiring', 'os_eol_last') {
foreach my $key ('os_eol_db', 'os_eol_expired',
'os_eol_expiring') {
delete($gconfig{$key});
}
}
webmin/os-eol-lib.pl
+6 -34
View File
@@ -188,31 +188,11 @@ return $eol_data;
# or until the next Webmin update
sub eol_update_cache
{
my (%miniserv, $updated);
# Is there valid cached data (cached for 30 days)
if ($gconfig{'os_eol_expired'} || $gconfig{'os_eol_expiring'}) {
if ($gconfig{'os_eol_last'} &&
$gconfig{'os_eol_last'} < time() - 60*60*24*30) {
# Invalidate the cache
foreach my $key
('os_eol_none', 'os_eol_expired',
'os_eol_expiring', 'os_eol_last',
'os_eol_about', 'os_eol', 'os_eol_in',
'os_ext_eol', 'os_ext_eol_in') {
delete($gconfig{$key});
}
$updated++;
}
else {
# Nothing to update, Webmin config has it all
return;
}
}
my %miniserv;
&get_miniserv_config(\%miniserv);
if (!$gconfig{'os_eol_none'} ||
($miniserv{'server'} && $gconfig{'os_eol_none'} ne $miniserv{'server'})) {
if ($gconfig{'os_eol_db'} ne $miniserv{'server'}) {
# This is the first time we check
# EOL data or after Webmin update\
# EOL data or after Webmin update
my $eol_data = &eol_get_os_data();
&eol_populate_dates($eol_data);
if (ref($eol_data)) {
@@ -231,18 +211,10 @@ if (!$gconfig{'os_eol_none'} ||
if ($eol_data->{'_ext_eol'});
$gconfig{'os_ext_eol_in'} = $eol_data->{'_ext_eol_in'}
if ($eol_data->{'_ext_eol_in'});
$gconfig{'os_eol_last'} = time();
delete($gconfig{'os_eol_none'});
$updated++;
}
else {
# No EOL data available, don't check
# again until next Webmin update
$gconfig{'os_eol_none'} = $miniserv{'server'};
$updated++;
}
}
if ($updated) {
# Store EOL db version and don't check it until next Webmin upgrade
$gconfig{'os_eol_db'} = $miniserv{'server'};
# Store the updated data
&lock_file("$config_directory/config");
&write_file("$config_directory/config", \%gconfig);