From 2c4f56b1d9dac3c515e22d76ff12af42fabd52d5 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Fri, 20 Jun 2014 20:21:48 +0100 Subject: [PATCH] remove OO notation from jobqueue calls --- Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Common.pm | 4 ++-- Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Common.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Common.pm index f4cb0938..70ce0630 100644 --- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Common.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Common.pm @@ -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, diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm index 04eb6370..d3950b22 100644 --- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm +++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm @@ -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,