Attachment 109476 Details for Bug 22417 – Bug 22417: Remove list of pending jobs

[patch] Bug 22417: Remove list of pending jobs

Bug-22417-Remove-list-of-pending-jobs.patch (text/plain), 2.95 KB, created by Jonathan Druart on 2020-09-02 09:59:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2020-09-02 09:59:38 UTC

Size: 2.95 KB

patch

obsolete

>From 237b1c9cc2a684141e9f0a464edabd1bd549df7f Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 2 Sep 2020 11:56:09 +0200
>Subject: [PATCH] Bug 22417: Remove list of pending jobs
>
>This was not accurate as it was only retrieving jobs for batch_biblio_record_modification
>
>We will need to improve that later if needed
>---
> admin/background_jobs.pl                      | 25 +------------------
> .../prog/en/modules/admin/background_jobs.tt  | 11 --------
> 2 files changed, 1 insertion(+), 35 deletions(-)
>
>diff --git a/admin/background_jobs.pl b/admin/background_jobs.pl
>index ef8422d39b..1d36b97e64 100755
>--- a/admin/background_jobs.pl
>+++ b/admin/background_jobs.pl
>@@ -79,30 +79,7 @@ if ( $op eq 'cancel' ) {
> 
> if ( $op eq 'list' ) {
>     my $jobs = Koha::BackgroundJobs->search({}, { order_by => { -desc => 'enqueued_on' }});
>-    my @pending_jobs;
>-    try {
>-        my $conn = Koha::BackgroundJob->connect;
>-        my $job_type = 'batch_biblio_record_modification';
>-        $conn->subscribe({ destination => $job_type, ack => 'client' });
>-        my @frames;
>-        while (my $frame = $conn->receive_frame({timeout => 1})) {
>-            last unless $frame;
>-            my $body = $frame->body;
>-            my $args = decode_json($body);
>-            push @pending_jobs, $args->{job_id};
>-            push @frames, $frame;
>-        }
>-        $conn->nack( { frame => $_ } ) for @frames;
>-        $conn->disconnect;
>-    } catch {
>-        push @messages, {
>-            type => 'error',
>-            code => 'cannot_retrieve_jobs',
>-            error => $_,
>-        };
>-    };
>-
>-    $template->param( jobs => $jobs, pending_jobs => \@pending_jobs, );
>+    $template->param( jobs => $jobs );
> }
> 
> $template->param(
>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 40cf28c9cf..8731486026 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
>@@ -23,8 +23,6 @@
> [% FOR m IN messages %]
>     <div class="dialog message">
>         [% SWITCH m.code %]
>-        [% CASE 'cannot_retrieve_jobs' %]
>-            <div><i class="fa fa-exclamation error"></i>Cannot retrieve pending jobs ([% m.error | html %])</div>
>         [% CASE 'cannot_view_job' %]
>             <div><i class="fa fa-exclamation error"></i>Insufficient permission to see this job.</div>
>         [% CASE %]
>@@ -143,15 +141,6 @@
> 
>     <h2>Background jobs</h2>
> 
>-    <div class="dialog message">
>-        <i class="fa fa-info"></i>
>-        [% IF pending_jobs.size > 0 %]
>-            There is [% pending_jobs.size | html %] pending jobs on the server: [% pending_jobs.join(', ') | html %].
>-        [% ELSE %]
>-            There is no pending jobs on the server.
>-        [% END %]
>-    </div>
>-
>     [% IF jobs.count %]
>         <table id="table_background_jobs">
>             <thead>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 22417: 105542 | 105543 | 107385 | 107386 | 107387 | 107388 | 107389 | 107390 | 107391 | 107392 | 107393 | 107394 | 107395 | 107396 | 107397 | 107398 | 107399 | 107400 | 107401 | 107402 | 107403 | 107404 | 107405 | 107406 | 107481 | 107482 | 107682 | 108023 | 108024 | 108025 | 108026 | 108027 | 108028 | 108029 | 108030 | 108031 | 108032 | 108033 | 108034 | 108035 | 108036 | 108037 | 108038 | 108039 | 108040 | 108041 | 108042 | 108043 | 108044 | 108045 | 108046 | 108047 | 109270 | 109271 | 109319 | 109320 | 109321 | 109322 | 109323 | 109324 | 109325 | 109326 | 109327 | 109328 | 109329 | 109330 | 109331 | 109332 | 109333 | 109334 | 109335 | 109336 | 109337 | 109338 | 109339 | 109340 | 109341 | 109342 | 109343 | 109344 | 109345 | 109350 | 109351 | 109355 | 109390 | 109391 | 109392 | 109393 | 109394 | 109395 | 109396 | 109397 | 109398 | 109399 | 109400 | 109401 | 109402 | 109403 | 109404 | 109405 | 109406 | 109407 | 109408 | 109409 | 109410 | 109411 | 109412 | 109413 | 109414 | 109415 | 109416 | 109417 | 109418 | 109474 | 109475 | 109476 | 109477 | 110150 | 111091 | 111092 | 111093 | 111094 | 111095 | 111096 | 111097 | 111098 | 111099 | 111100 | 111101 | 111102 | 111103 | 111104 | 111105 | 111106 | 111107 | 111108 | 111109 | 111110 | 111111 | 111112 | 111113 | 111114 | 111115 | 111116 | 111117 | 111118 | 111119 | 111120 | 111121 | 111238 | 111239 | 111245