VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-01 07:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix manual refresh for system info and minor os version detection

Browse Source 
559c7d4bd0
This commit is contained in:
Ilia Rostovtsev
2021-02-04 16:36:18 +03:00
parent 61a2cf01a3
commit 75be2dc7b2
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
system-status/system-status-lib.pl
View File

@ -19,7 +19,7 @@ if (!-e $historic_info_dir) {
}
our $get_collected_info_cache;
# collect_system_info([manual])
# collect_system_info([manual-refesh-no-cache-even-for-heavy])
# Returns a hash reference containing system information
sub collect_system_info
{
@ -99,26 +99,30 @@ if (defined($manual) && $manual eq 'manual') {
return $info;
}
# get_collected_info()
# get_collected_info([manual-refesh-no-cache])
# Returns the most recently collected system information, or the current info
sub get_collected_info
{
if ($get_collected_info_cache) {
# Already in RAM
return $get_collected_info_cache;
}
my @st = stat($collected_info_file);
my $i = $config{'collect_interval'} || 'none';
if ($i ne 'none' && @st && $st[9] > time() - $i * 60 * 2) {
my $infostr = &read_file_contents($collected_info_file);
if ($infostr) {
my $info = &unserialise_variable($infostr);
if (ref($info) eq 'HASH' && keys(%$info) > 0) {
$get_collected_info_cache = $info;
my ($manual) = @_;
if (!defined($manual) ||
defined($manual) && $manual ne 'manual') {
if ($get_collected_info_cache) {
# Already in RAM
return $get_collected_info_cache;
}
my @st = stat($collected_info_file);
my $i = $config{'collect_interval'} || 'none';
if ($i ne 'none' && @st && $st[9] > time() - $i * 60 * 2) {
my $infostr = &read_file_contents($collected_info_file);
if ($infostr) {
my $info = &unserialise_variable($infostr);
if (ref($info) eq 'HASH' && keys(%$info) > 0) {
$get_collected_info_cache = $info;
}
}
}
}
$get_collected_info_cache ||= &collect_system_info();
$get_collected_info_cache ||= &collect_system_info($manual);
return $get_collected_info_cache;
}

1
webmin/webmin-lib.pl
View File

@ -1131,6 +1131,7 @@ my %miniserv;
# Need OS upgrade
my %realos = &detect_operating_system(undef, 1);
if (($realos{'os_version'} ne $gconfig{'os_version'} ||
$realos{'real_os_version'} ne $gconfig{'real_os_version'} ||
$realos{'os_type'} ne $gconfig{'os_type'}) &&
$realos{'os_version'} && $realos{'os_type'} &&
&foreign_available("webmin")) {