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

move expire and expirenodes to worker plugins

Browse Source
This commit is contained in:
Oliver Gorwits
2017-09-09 14:56:15 +01:00
parent 271ef1a25c
commit 68ca85643b
2 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/App/Netdisco/Backend/Worker/Poller/Expiry.pm → lib/App/Netdisco/Worker/Plugin/Expire.pm
View File

@@ -1,17 +1,14 @@
package App::Netdisco::Backend::Worker::Poller::Expiry; package App::Netdisco::Worker::Plugin::Expire;
use Dancer ':syntax';
use App::Netdisco::Worker::Plugin;
use aliased 'App::Netdisco::Worker::Status';
use Dancer qw/:moose :syntax :script/;
use Dancer::Plugin::DBIC 'schema'; use Dancer::Plugin::DBIC 'schema';
use App::Netdisco::Backend::Util ':all';
use App::Netdisco::Util::Statistics 'update_stats'; use App::Netdisco::Util::Statistics 'update_stats';
use Role::Tiny; register_worker({ primary => true }, sub {
use namespace::clean; my ($job, $workerconf) = @_;
# expire devices and nodes according to config
sub expire {
my ($self, $job) = @_;
if (setting('expire_devices') and setting('expire_devices') > 0) { if (setting('expire_devices') and setting('expire_devices') > 0) {
schema('netdisco')->txn_do(sub { schema('netdisco')->txn_do(sub {
@@ -54,25 +51,7 @@ sub expire {
# now update stats # now update stats
update_stats(); update_stats();
return job_done("Checked expiry and updated stats"); return Status->done('Checked expiry and updated stats');
}
# expire nodes for a specific device
sub expirenodes {
my ($self, $job) = @_;
return job_error('Missing device') unless $job->device;
schema('netdisco')->txn_do(sub {
schema('netdisco')->resultset('Node')->search({
switch => $job->device->ip,
($job->port ? (port => $job->port) : ()),
})->delete(
($job->extra ? () : ({ archive_nodes => 1 }))
);
}); });
return job_done("Expired nodes for ". $job->device->ip); true;
}
1;

27
lib/App/Netdisco/Worker/Plugin/ExpireNodes.pm Normal file
View File

@@ -0,0 +1,27 @@
package App::Netdisco::Worker::Plugin::ExpireNodes;
use Dancer ':syntax';
use App::Netdisco::Worker::Plugin;
use aliased 'App::Netdisco::Worker::Status';
use Dancer::Plugin::DBIC 'schema';
register_worker({ primary => true }, sub {
my ($job, $workerconf) = @_;
return Status->error('nbtstat failed: unable to interpret device param')
if !defined $job->device;
schema('netdisco')->txn_do(sub {
schema('netdisco')->resultset('Node')->search({
switch => $job->device->ip,
($job->port ? (port => $job->port) : ()),
})->delete(
($job->extra ? () : ({ archive_nodes => 1 }))
);
});
return Status->done('Expired nodes for '. $job->device->ip);
});
true;