Bugzilla – Attachment 55138 Details for
Bug 17240
Allow processes that rely on background jobs run in Plack mode
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17240 - Allow processes that rely on background jobs run in Plack mode
Bug-17240---Allow-processes-that-rely-on-backgroun.patch (text/plain), 7.76 KB, created by
Fridolin Somers
on 2016-09-02 14:15:24 UTC
(
hide
)
Description:
Bug 17240 - Allow processes that rely on background jobs run in Plack mode
Filename:
MIME Type:
Creator:
Fridolin Somers
Created:
2016-09-02 14:15:24 UTC
Size:
7.76 KB
patch
obsolete
>From 14cd38ec3b1cd36b2ba1f3be7e3f2e576f8ef294 Mon Sep 17 00:00:00 2001 >From: Fridolin Somers <fridolin.somers@biblibre.com> >Date: Fri, 2 Sep 2016 12:57:31 +0200 >Subject: [PATCH] Bug 17240 - Allow processes that rely on background jobs run > in Plack mode > >Since Plack mode (PSGI), the processes running with background jobs are broken. > >Bug 15218 corrected by using CGI mode for concerned pages. > >This patch proposes to allow running those pages in PSGI mode by disabling background jobs when PSGI is used. > >Script are running so faster with Plack, there are less chances that the process will end in HTTP timeout. > >Test plan : > - on a Koha running with plack > - revert Bug 15218 changes > - test processes on pages : > offline_circ/process_koc.pl > tools/batchMod-edit.pl > tools/batch_record_modification.pl > tools/manage-marc-import.pl > tools/stage-marc-import.pl > tools/upload-images.pl >--- > koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 2 +- > .../intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt | 2 +- > 6 files changed, 7 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >index 01275e0..87effd9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >@@ -116,7 +116,7 @@ function CheckForm(f) { > > <form action="process_koc.pl" id="enqueuefile" method="post" enctype="multipart/form-data"> > <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" /> >- <input type="hidden" name="runinbackground" id="runinbackground" value="" /> >+ [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %] > <input type="hidden" name="completedJobID" id="completedJobID" value="" /> > <input type="submit" value="Apply directly" onclick="return CheckForm(this.form);" id="mainformsubmit" /> > <div id="jobstatus" style="display:none">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >index 7432604..0de08e7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >@@ -101,7 +101,7 @@ $(document).ready(function(){ > <form name="f" action="batchMod.pl" method="post"> > <input type="hidden" name="op" value="[% op %]" /> > <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" /> >- <input type="hidden" name="runinbackground" id="runinbackground" value="" /> >+ [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %] > <input type="hidden" name="completedJobID" id="completedJobID" value="" /> > <input type="hidden" name="src" id="src" value="[% src %]" /> > [% IF biblionumber %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >index 2d7d534..a695b68 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -247,7 +247,7 @@ $(document).ready(function() { > <input type="hidden" name="op" value="modify" /> > <input type="hidden" name="recordtype" value="[% recordtype %]" /> > <input type="button" id="mainformsubmit" value="Modify selected records" class="button" /> >- <input type="hidden" name="runinbackground" id="runinbackground" value="" /> >+ [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %] > <input type="hidden" name="completedJobID" id="completedJobID" value="" /> > <a class="cancel" href="/cgi-bin/koha/tools/batch_record_modification.pl">Cancel</a> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >index a8a9572..44d293a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >@@ -341,7 +341,7 @@ $(document).ready(function(){ > [% IF ( can_commit ) %] > <form action="[% script_name %]" method="post"> > <input type="hidden" name="op" value="commit-batch" /> >- <input type="hidden" name="runinbackground" value="" /> >+ [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %] > <input type="hidden" name="completedJobID" value="" /> > <input type="hidden" name="import_batch_id" value="[% import_batch_id %]" /> > <fieldset class="action"> >@@ -364,7 +364,7 @@ $(document).ready(function(){ > [% IF ( can_revert ) %] > <form action="[% script_name %]" method="post"> > <input type="hidden" name="op" value="revert-batch" /> >- <input type="hidden" name="runinbackground" value="" /> >+ [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %] > <input type="hidden" name="completedJobID" value="" /> > <input type="hidden" name="import_batch_id" value="[% import_batch_id %]" /> > <fieldset class="action"><input type="submit" class="button" name="mainformsubmit" value="Undo import into catalog" onclick="return confirm(MSG_CONFIRM_UNDO_IMPORT) && submitBackgroundJob(this.form);" /></fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >index 45aeac9..36553c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >@@ -164,7 +164,7 @@ function cbUpload( status, fileid ) { > <form method="post" id="processfile" action="[% SCRIPT_NAME %]" enctype="multipart/form-data"> > <fieldset class="rows"> > <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" /> >- <input type="hidden" name="runinbackground" id="runinbackground" value="" /> >+ [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %] > <input type="hidden" name="completedJobID" id="completedJobID" value="" /> > <ol><li> > <label for="comments">Comments about this file: </label> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index a1300fc..e570b04 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >@@ -114,7 +114,7 @@ $(document).ready(function(){ > <form method="post" id="processfile" action="/cgi-bin/koha/tools/upload-cover-image.pl" enctype="multipart/form-data"> > <fieldset class="rows"> > <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" /> >- <input type="hidden" name="runinbackground" id="runinbackground" value="" /> >+ [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %] > <input type="hidden" name="completedJobID" id="completedJobID" value="" /> > </fieldset> > <fieldset class="rows"> >-- >2.7.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17240
:
55110
|
55111
|
55129
|
55130
|
55137
|
55138
|
55257
|
58461
|
63291
|
63459
|
63862
|
76477
|
76478
|
76479
|
76480
|
76481
|
76482