From 9569bda4d876aa7b43a2ff126c8b4481d1f640e0 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 10 May 2014 22:44:20 +0100
Subject: [PATCH] migrate to JobQueue :)

---
 Netdisco/lib/App/Netdisco/Web/AdminTask.pm   | 20 ++++++++------------
 Netdisco/lib/App/Netdisco/Web/PortControl.pm |  5 +++--
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Netdisco/lib/App/Netdisco/Web/AdminTask.pm b/Netdisco/lib/App/Netdisco/Web/AdminTask.pm
index 4b02b178..7134d86d 100644
--- a/Netdisco/lib/App/Netdisco/Web/AdminTask.pm
+++ b/Netdisco/lib/App/Netdisco/Web/AdminTask.pm
@@ -5,7 +5,7 @@ use Dancer::Plugin::Ajax;
 use Dancer::Plugin::DBIC;
 use Dancer::Plugin::Auth::Extensible;
 
-use Try::Tiny;
+use App::Netdisco::JobQueue 'jq_insert';
 
 sub add_job {
     my ($action, $device, $subaction) = @_;
@@ -16,17 +16,13 @@ sub add_job {
           if ! $device or $device->addr eq '0.0.0.0';
     }
 
-    # job might already be in the queue, so this could die
-    try {
-        schema('netdisco')->resultset('Admin')->create({
-          ($device ? (device => $device->addr) : ()),
-          action => $action,
-          ($subaction ? (subaction => $subaction) : ()),
-          status => 'queued',
-          username => session('logged_in_user'),
-          userip => request->remote_address,
-        });
-    };
+    jq_insert({
+        ($device ? (device => $device->addr) : ()),
+        action => $action,
+        ($subaction ? (subaction => $subaction) : ()),
+        username => session('logged_in_user'),
+        userip => request->remote_address,
+    });
 }
 
 foreach my $action (keys %{ setting('job_types') }) {
diff --git a/Netdisco/lib/App/Netdisco/Web/PortControl.pm b/Netdisco/lib/App/Netdisco/Web/PortControl.pm
index b362fb70..fb41835f 100644
--- a/Netdisco/lib/App/Netdisco/Web/PortControl.pm
+++ b/Netdisco/lib/App/Netdisco/Web/PortControl.pm
@@ -5,6 +5,8 @@ use Dancer::Plugin::Ajax;
 use Dancer::Plugin::DBIC;
 use Dancer::Plugin::Auth::Extensible;
 
+use App::Netdisco::JobQueue 'jq_insert';
+
 ajax '/ajax/portcontrol' => require_role port_control => sub {
     send_error('No device/port/field', 400)
       unless param('device') and (param('port') or param('field'));
@@ -44,12 +46,11 @@ ajax '/ajax/portcontrol' => require_role port_control => sub {
           });
       }
 
-      schema('netdisco')->resultset('Admin')->create({
+      jq_insert({
         device => param('device'),
         port => param('port'),
         action => $action,
         subaction => $subaction,
-        status => 'queued',
         username => session('logged_in_user'),
         userip => request->remote_address,
         log => $log,