From 7ab53318e0a75ed24f685ec5dc275c2a26801610 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 19 Feb 2020 14:00:03 +0100
Subject: [PATCH] Bug 22417: Switch to STOMP

apt install rabbitmq-server
service rabbitmq-server start
rabbitmq-plugins enable rabbitmq_stomp
apt install libnet-stomp-perl
cp debian/scripts/koha-functions.sh /usr/share/koha/bin/koha-functions.sh
cp debian/scripts/koha-worker /usr/bin/
koha-worker --start kohadev
tail -f /var/log/rabbitmq/*

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: David Cook <dcook@prosentient.com.au>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Bug 22417: Remove useless use statement

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
---
 Koha/BackgroundJob.pm                         | 29 +++----------
 Koha/BackgroundJob/BatchUpdateAuthority.pm    |  1 -
 Koha/BackgroundJob/BatchUpdateBiblio.pm       |  6 +--
 .../prog/en/modules/admin/background_jobs.tt  |  8 ++--
 misc/background_jobs_worker.pl                | 43 ++++++++-----------
 tools/batch_record_modification.pl            |  1 -
 6 files changed, 28 insertions(+), 60 deletions(-)

diff --git a/Koha/BackgroundJob.pm b/Koha/BackgroundJob.pm
index 3224b5d486..252091489e 100644
--- a/Koha/BackgroundJob.pm
+++ b/Koha/BackgroundJob.pm
@@ -3,7 +3,7 @@ package Koha::BackgroundJob;
 use Modern::Perl;
 use JSON qw( encode_json decode_json );
 use Carp qw( croak );
-use Net::RabbitFoot;
+use Net::Stomp;
 
 use C4::Context;
 use Koha::DateUtils qw( dt_from_string );
@@ -13,15 +13,9 @@ use base qw( Koha::Object );
 
 sub connect {
     my ( $self );
-    my $conn = Net::RabbitFoot->new()->load_xml_spec()->connect(
-        host => 'localhost', # TODO Move this to KOHA_CONF
-        port => 5672,
-        user => 'guest',
-        pass => 'guest',
-        vhost => '/',
-    );
-
-    return $conn;
+    my $stomp = Net::Stomp->new( { hostname => 'localhost', port => '61613' } );
+    $stomp->connect( { login => 'guest', passcode => 'guest' } );
+    return $stomp;
 }
 
 sub enqueue {
@@ -47,19 +41,8 @@ sub enqueue {
     $json_args = encode_json $job_args,
 
     my $conn = $self->connect;
-    my $channel = $conn->open_channel();
-
-    $channel->declare_queue(
-        queue => $job_type,
-        durable => 1,
-    );
-
-    $channel->publish(
-        exchange => '',
-        routing_key => $job_type, # TODO Must be different?
-        body => $json_args,
-    );
-    $conn->close;
+    $conn->send({destination => $job_type, body => $json_args});
+
     return $job_id;
 }
 
diff --git a/Koha/BackgroundJob/BatchUpdateAuthority.pm b/Koha/BackgroundJob/BatchUpdateAuthority.pm
index 4d43606f2c..682501a261 100644
--- a/Koha/BackgroundJob/BatchUpdateAuthority.pm
+++ b/Koha/BackgroundJob/BatchUpdateAuthority.pm
@@ -4,7 +4,6 @@ use Modern::Perl;
 use Koha::BackgroundJobs;
 use Koha::DateUtils qw( dt_from_string );
 use JSON qw( encode_json decode_json );
-use Net::RabbitFoot;
 
 use base 'Koha::BackgroundJob';
 
diff --git a/Koha/BackgroundJob/BatchUpdateBiblio.pm b/Koha/BackgroundJob/BatchUpdateBiblio.pm
index 990b34902a..09c53fa185 100644
--- a/Koha/BackgroundJob/BatchUpdateBiblio.pm
+++ b/Koha/BackgroundJob/BatchUpdateBiblio.pm
@@ -4,20 +4,17 @@ use Modern::Perl;
 use Koha::BackgroundJobs;
 use Koha::DateUtils qw( dt_from_string );
 use JSON qw( encode_json decode_json );
-use Net::RabbitFoot;
 
 use base 'Koha::BackgroundJob';
 
-our $channel;
 sub process {
-    my ( $self, $args, $channel ) = @_;
+    my ( $self, $args ) = @_;
 
     my $job_type = $args->{job_type};
 
     my $job = Koha::BackgroundJobs->find( $args->{job_id} );
 
     if ( !exists $args->{job_id} || !$job || $job->status eq 'cancelled' ) {
-        $channel->ack;
         return;
     }
 
@@ -77,7 +74,6 @@ sub process {
         ->data(encode_json $job_data);
     $job->status('finished') if $job->status ne 'cancelled';
     $job->store;
-    $channel->ack(); # FIXME Is that ok even on failure?
 }
 
 sub enqueue {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
index 8009711e92..d1cc6cec7d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
@@ -141,9 +141,9 @@
                     <td class="actions">
                         <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&amp;id=[% job.id | html %]"><i class="fa fa-eye"></i> View</a>
                         [% IF job.status == 'new' || job.status == 'started' %]
-                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=cancel&amp;id=[% job.id | html %]"><i class="fa fa-pencil"></i> Cancel</a>
+                            <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=cancel&amp;id=[% job.id | html %]"><i class="fa fa-trash"></i> Cancel</a>
                         [% END %]
-                        <a class="btn btn-default btn-xs disabled" href="/cgi-bin/koha/admin/background_jobs.pl?op=replay&amp;id=[% job.id | html %]"><i class="fa fa-trash"></i> Replay</a>
+                        <a class="btn btn-default btn-xs disabled" href="/cgi-bin/koha/admin/background_jobs.pl?op=replay&amp;id=[% job.id | html %]"><i class="fa fa-refresh"></i> Replay</a>
                     </td>
                 </tr>
                 [% END %]
@@ -171,11 +171,11 @@
     [% INCLUDE 'datatables.inc' %]
     <script>
         $(document).ready(function() {
-            $("#table_cities").dataTable($.extend(true, {}, dataTablesDefaults, {
+            $("#table_background_jobs").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "aoColumnDefs": [
                     { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
                 ],
-                "aaSorting": [[ 1, "asc" ]],
+                "aaSorting": [[ 0, "desc" ]],
                 "iDisplayLength": 10,
                 "sPaginationType": "full_numbers"
             }));
diff --git a/misc/background_jobs_worker.pl b/misc/background_jobs_worker.pl
index 2d7264b139..6bc7335453 100755
--- a/misc/background_jobs_worker.pl
+++ b/misc/background_jobs_worker.pl
@@ -23,30 +23,21 @@ use Koha::BackgroundJob;
 
 my $conn = Koha::BackgroundJob->connect;
 
-my $channel = $conn->open_channel();
-
 my $job_type = 'batch_biblio_record_modification';
-$channel->declare_queue(
-    queue => $job_type,
-    durable => 1,
-);
-
-$channel->qos(prefetch_count => 1,);
-
-$channel->consume(
-    on_consume => sub {
-        my $var = shift;
-        my $body = $var->{body}->{payload};
-        say " [x] Received $body";
-
-        my $args = decode_json( $body );
-
-        Koha::BackgroundJob::BatchUpdateBiblio->process($args, $channel);
-        say " [x] Done";
-    },
-    no_ack => 0,
-);
-
-warn "waiting forever";
-# Wait forever
-AnyEvent->condvar->recv;
+
+$conn->subscribe({ destination => $job_type, ack => 'client' });
+while (1) {
+    my $frame = $conn->receive_frame;
+    if ( !defined $frame ) {
+        # maybe log connection problems
+        next;    # will reconnect automatically
+    }
+
+    my $body = $frame->body;
+    my $args = decode_json($body);
+
+    my $success = Koha::BackgroundJob::BatchUpdateBiblio->process( $args );
+
+    $conn->ack( { frame => $frame } ); # FIXME depending on $success?
+}
+$conn->disconnect;
diff --git a/tools/batch_record_modification.pl b/tools/batch_record_modification.pl
index d0f017674b..23d54de053 100755
--- a/tools/batch_record_modification.pl
+++ b/tools/batch_record_modification.pl
@@ -23,7 +23,6 @@ use Modern::Perl;
 use CGI;
 use List::MoreUtils qw( uniq );
 use JSON qw( encode_json );
-use Net::RabbitFoot;
 
 use C4::Auth qw( get_template_and_user );
 use C4::Output qw( output_html_with_http_headers );
-- 
2.20.1