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

#364 expire_nodeip_freshness setting to revert expire to ND1 behavior [skip ci]

Browse Source
This commit is contained in:
Oliver Gorwits
2018-01-31 11:49:08 +00:00
parent 3470f82b0f
commit afeac23fba
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/App/Netdisco/Worker/Plugin/Expire.pm
View File

@@ -23,6 +23,14 @@ register_worker({ phase => 'main' }, sub {
if (setting('expire_nodes') and setting('expire_nodes') > 0) {
schema('netdisco')->txn_do(sub {
my $freshness = ((defined setting('expire_nodeip_freshness'))
? setting('expire_nodeip_freshness') : setting('expire_nodes'));
if ($freshness) {
schema('netdisco')->resultset('NodeIp')->search({
time_last => \[q/< (now() - ?::interval)/, ($freshness * 86400)],
})->delete();
}
schema('netdisco')->resultset('Node')->search({
time_last => \[q/< (now() - ?::interval)/,
(setting('expire_nodes') * 86400)],
@@ -32,6 +40,14 @@ register_worker({ phase => 'main' }, sub {
if (setting('expire_nodes_archive') and setting('expire_nodes_archive') > 0) {
schema('netdisco')->txn_do(sub {
my $freshness = ((defined setting('expire_nodeip_freshness'))
? setting('expire_nodeip_freshness') : setting('expire_nodes_archive'));
if ($freshness) {
schema('netdisco')->resultset('NodeIp')->search({
time_last => \[q/< (now() - ?::interval)/, ($freshness * 86400)],
})->delete();
}
schema('netdisco')->resultset('Node')->search({
-not_bool => 'active',
time_last => \[q/< (now() - ?::interval)/,