135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

half work of updating web stats page to use stats table

Browse Source
This commit is contained in:
Oliver Gorwits
2017-06-28 13:16:52 +01:00
parent 47bf38568e
commit ccd279d918
2 changed files with 18 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/App/Netdisco/Backend/Worker/Poller/Expiry.pm
View File

@@ -88,8 +88,9 @@ sub expire {
netdisco_ver => $App::Netdisco::VERSION,
snmpinfo_ver => $snmpinfo_ver,
schema_ver => $schema->schema_version,
perl_ver => $],
pg_ver => $schema->storage->dbh->{pg_server_version},
perl_ver => pretty_version($], 3),
pg_ver =>
pretty_version($schema->storage->dbh->{pg_server_version}, 2),
}, { key => 'primary' });
});
@@ -97,6 +98,17 @@ sub expire {
return job_done("Checked expiry and updated stats");
}
# take perl or pg versions and make pretty
sub pretty_version {
my ($version, $seglen) = @_;
return unless $version and $seglen;
$version =~ s/\.//g;
$version = (join '.', reverse map {scalar reverse}
unpack("(A${seglen})*", reverse $version));
$version =~ s/\.0+/\./g;
return $version;
}
# expire nodes for a specific device
sub expirenodes {
my ($self, $job) = @_;