simplify again

This commit is contained in:
Oliver Gorwits
2014-05-10 22:38:20 +01:00
parent 58cba4da24
commit 41ee8f91f2
3 changed files with 121 additions and 106 deletions

View File

@@ -5,6 +5,7 @@ use Dancer::Plugin::DBIC 'schema';
use App::Netdisco::Util::Device qw/get_device is_discoverable/;
use App::Netdisco::Util::DNS ':all';
use App::Netdisco::JobQueue qw/jq_queued jq_insert/;
use NetAddr::IP::Lite ':lower';
use List::MoreUtils ();
use Encode;
@@ -900,20 +901,12 @@ sub discover_new_neighbors {
next;
}
# Don't queued if job already exists
my $is_queued = schema('netdisco')->resultset('Admin')->search(
{ device => $ip,
# Don't queue if job already exists
if (List::MoreUtils::none {$_ eq $ip} jq_queued('discover')) {
jq_insert({
device => $ip,
action => 'discover',
status => { -like => 'queued%' },
}
)->single;
unless ($is_queued) {
schema('netdisco')->resultset('Admin')->create(
{ device => $ip,
action => 'discover',
status => 'queued',
}
);
});
}
}
}