Bugzilla – Attachment 184997 Details for
Bug 39740
[Follow-up of 36932] Split dev_install into git_install and debug_mode
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 39740: (QA follow-up) Adjust debugger for koha-plack and koha-z3950-responder
Bug-39740-QA-follow-up-Adjust-debugger-for-koha-pl.patch (text/plain), 4.71 KB, created by
Tomás Cohen Arazi (tcohen)
on 2025-08-01 12:14:06 UTC
(
hide
)
Description:
Bug 39740: (QA follow-up) Adjust debugger for koha-plack and koha-z3950-responder
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2025-08-01 12:14:06 UTC
Size:
4.71 KB
patch
obsolete
>From 53e6310aeabededea88c69f183beb9dfedf99ed9 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Wed, 30 Jul 2025 13:27:58 +0200 >Subject: [PATCH] Bug 39740: (QA follow-up) Adjust debugger for koha-plack and > koha-z3950-responder > >This patch mainly renames var debug_mode in both scripts when it refers >to the debugger instead of the instance's debug_mode. > >Note: Removing $environment from responder, probably copied. > >Test plan: >cp debian/scripts/koha-functions.sh /usr/share/koha/bin/ >cp debian/scripts/koha-* /usr/sbin/ >cp debian/templates/plack.psgi /etc/koha/plack.psgi >Repeat steps from patch: "Replace envvar check by calling..." >Repeat steps from patch: "Adjust koha-plack and koha-z3950-responder" > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > debian/scripts/koha-plack | 15 +++++++-------- > debian/scripts/koha-z3950-responder | 16 +++++++--------- > 2 files changed, 14 insertions(+), 17 deletions(-) > >diff --git a/debian/scripts/koha-plack b/debian/scripts/koha-plack >index 661b490cad2..7c112e906c8 100755 >--- a/debian/scripts/koha-plack >+++ b/debian/scripts/koha-plack >@@ -102,8 +102,8 @@ start_plack() > --error-log /var/log/koha/${instancename}/plack-error.log" > max_requests_and_workers="--max-requests ${PLACK_MAX_REQUESTS} --workers ${PLACK_WORKERS}" > >- # Enable debug mode in development >- if [ "$debug_mode" = "yes" ] && [ "$environment" = "development" ]; then >+ # Enable debugger? >+ if [ "$debugger" = "yes" ] && [ "$environment" = "development" ]; then > daemonize="" > logging="" # remote debugger takes care > max_requests_and_workers="--workers 1" >@@ -373,10 +373,9 @@ _do_instance() { > if [ "$KOHA_BINDIR" = "misc" ]; then GIT_INSTALL=1; else GIT_INSTALL=""; fi > export PERL5LIB KOHA_HOME GIT_INSTALL > >- # If debug mode is enabled, add the debugger lib path >- # to PERL5LIB if appropriate >- #FIXME: many of these variables should be set in a higher scope >- if [ "$debug_mode" = "yes" ]; then >+ # If debugger is enabled, add the debugger lib path to PERL5LIB if appropriate >+ # FIXME: many of these variables should be set in a higher scope >+ if [ "$debugger" = "yes" ]; then > if [ "$debugger_path" != "" ]; then > PERL5LIB="${debugger_path}":$PERL5LIB > fi >@@ -418,7 +417,7 @@ _do_instance() { > STARMAN=$(which starman) > op="" > quiet="no" >-debug_mode="no" >+debugger="no" > debugger_key="" > debugger_location="localhost:9000" > debugger_path="" >@@ -454,7 +453,7 @@ while [ $# -gt 0 ]; do > set_action "status" > shift ;; > --debugger) >- debug_mode="yes" >+ debugger="yes" > shift ;; > --debugger-key) > debugger_key="$2" >diff --git a/debian/scripts/koha-z3950-responder b/debian/scripts/koha-z3950-responder >index 97fd6b88fa7..9c0f5894da1 100755 >--- a/debian/scripts/koha-z3950-responder >+++ b/debian/scripts/koha-z3950-responder >@@ -86,13 +86,12 @@ start_z3950() > logging="-l /var/log/koha/${instancename}/z3950.log" > > Z3950RESPONDER="/usr/bin/perl $KOHA_HOME/$KOHA_BINDIR/z3950_responder.pl" >- if [ "$debug_mode" = "yes" ] && is_debug_mode $instancename; then >- environment="development" >+ if [ "$debugger" = "yes" ] && is_debug_mode $instancename; then > daemonize="" > logging="" # remote debugger takes care > Z3950RESPONDER="/usr/bin/perl -d $KOHA_HOME/$KOHA_BINDIR/z3950_responder.pl" >- elif [ "$debug_mode" = "yes" ]; then >- warn "Not a test system, disabling debug mode" >+ elif [ "$debugger" = "yes" ]; then >+ warn "Not a test system, disabling debugger" > fi > > Z3950OPTS="-c ${CONFIGDIR} \ >@@ -238,7 +237,7 @@ set_action() > > op="" > quiet="no" >-debug_mode="no" >+debugger="no" > debugger_key="" > debugger_location="localhost:9000" > debugger_path="" >@@ -268,7 +267,7 @@ while [ $# -gt 0 ]; do > set_action "disable" > shift ;; > --debugger) >- debug_mode="yes" >+ debugger="yes" > shift ;; > --debugger-key) > debugger_key="$2" >@@ -296,9 +295,8 @@ if [ $# -gt 0 ]; then > > adjust_paths_git_install $name > PERL5LIB=$PERL5LIB:$KOHA_HOME/installer:$KOHA_HOME/lib/installer >- # If debug mode is enabled, add the debugger lib path >- # to PERL5LIB if appropriate >- if [ "$debug_mode" = "yes" ] && is_debug_mode $name; then >+ # If debugger is enabled, add the debugger lib path to PERL5LIB if appropriate >+ if [ "$debugger" = "yes" ]; then > if [ "$debugger_path" != "" ]; then > PERL5LIB="${debugger_path}":$PERL5LIB > fi >-- >2.50.1
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 39740
:
184187
|
184432
|
184798
|
184799
|
184800
|
184801
|
184802
|
184803
|
184804
|
184873
|
184874
|
184920
|
184989
|
184990
|
184991
|
184992
|
184993
|
184994
|
184995
|
184996
| 184997 |
184998