percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-10-18 16:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix get_perl_module_version(). Add 'hours until next check' to debug output.

Browse Source
This commit is contained in:
Daniel Nichter
2013-02-14 08:28:18 -07:00
parent 6c79f4a5c1
commit 4545926556
21 changed files with 177 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/VersionCheck.pm
View File

@@ -187,7 +187,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -455,7 +458,6 @@ sub get_versions {
return \%versions;
}
# #############################################################################
# Version getters
# #############################################################################
@@ -554,18 +556,10 @@ sub get_perl_module_version {
# If there's a var, then its an explicit Perl variable name to get,
# else the item name is an implicity Perl module name to which we
# append ::VERSION to get the module's version.
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
# Explicitly stringify this else $PERL_VERSION will return
# as a version object.
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {