remove OO notation from jobqueue calls

This commit is contained in:
Oliver Gorwits
2014-06-20 20:21:48 +01:00
parent 869f35ec31
commit 2c4f56b1d9
2 changed files with 6 additions and 6 deletions

View File

@@ -20,12 +20,12 @@ sub _walk_body {
my $layer_method = $job_type .'_layer';
my $job_layer = $self->$layer_method;
my %queued = map {$_ => 1} $self->jq_queued($job_type);
my %queued = map {$_ => 1} jq_queued($job_type);
my @devices = schema('netdisco')->resultset('Device')
->has_layer($job_layer)->get_column('ip')->all;
my @filtered_devices = grep {!exists $queued{$_}} @devices;
$self->jq_insert([
jq_insert([
map {{
device => $_,
action => $job_type,

View File

@@ -18,12 +18,12 @@ use namespace::clean;
sub discoverall {
my ($self, $job) = @_;
my %queued = map {$_ => 1} $self->jq_queued('discover');
my %queued = map {$_ => 1} jq_queued('discover');
my @devices = schema('netdisco')->resultset('Device')
->get_column('ip')->all;
my @filtered_devices = grep {!exists $queued{$_}} @devices;
$self->jq_insert([
jq_insert([
map {{
device => $_,
action => 'discover',
@@ -72,7 +72,7 @@ sub discover {
# if requested, and the device has not yet been arpniped/macsucked, queue now
if ($device->in_storage and $job->subaction and $job->subaction eq 'with-nodes') {
if (!defined $device->last_macsuck) {
$self->jq_insert({
jq_insert({
device => $device->ip,
action => 'macsuck',
username => $job->username,
@@ -81,7 +81,7 @@ sub discover {
}
if (!defined $device->last_arpnip) {
$self->jq_insert({
jq_insert({
device => $device->ip,
action => 'arpnip',
username => $job->username,