[koha-commits] main Koha release repository branch 20.05.x updated. v20.05.04-49-g2917ce7535

Tue Oct 20 17:03:54 CEST 2020

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 20.05.x has been updated
       via  2917ce75352c9e6577e2e473ebaab6d729d57e1a (commit)
       via  25754e02aa5b67f1c2eb7b682651933aabb9639b (commit)
       via  9ee5da39a274f8f2ef7428cd72a2b029352dd2c6 (commit)
       via  1610c5101475274b6a9866fdc5c8211e7268b8f1 (commit)
       via  7317493c821295d35274105ae4bbf9d566277b39 (commit)
       via  d8717c994ee37e298e80a4c0e4f83c35c6c62b9a (commit)
      from  d35a7e753e29a840af8bb1173e285e01575830af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2917ce75352c9e6577e2e473ebaab6d729d57e1a
Author: David Cook <dcook at prosentient.com.au>
Date:   Wed Aug 26 00:58:36 2020 +0000

    Bug 16357: Only use Log4perl middleware if appenders defined

    This patch checks that the loggers used by the middleware
    actually have appenders defined.

    Without this patch, if the loggers don't have appenders
    defined in the log4perl file, the logs will just be lost.

    Signed-off-by: Arthur Suzuki <arthur.suzuki at biblibre.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 68ec27562fbb89c68058505b35c14aab7accc7fb)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 25754e02aa5b67f1c2eb7b682651933aabb9639b
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date:   Tue Aug 25 12:22:29 2020 +0000

    Bug 16357: (QA follow-up) Add log4perl configs during package upgrade

    If plack.psgi is updated to the newer version and the log4perl.conf file
    is not then the warnings will not be logged anywhere. This adds the
    log4perl configurations that are needed for logging for pre-existing Koha
    installation which are upgraded.

    Signed-off-by: Arthur Suzuki <arthur.suzuki at biblibre.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 5651facf0574f028250aeb8f30d6d8e2a5ebaabe)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 9ee5da39a274f8f2ef7428cd72a2b029352dd2c6
Author: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
Date:   Tue Aug 25 12:10:20 2020 +0000

    Bug 16357: (QA follow-up) Only initialize Log4perl module

    Koha::Logger->get was setting up some extra variables
    which are not used nor needed for the Plack::Middleware::Log4perl
    middleware to work. According to documentation at
    https://metacpan.org/pod/Plack::Middleware::Log4perl#SYNOPSIS
    only running Log::Log4perl::init, enabling Log4Perl middleware and
    setting up the logging category is enough. Koha::Logger->_init runs the
    Log::Log4perl::init and enabling and setting category is handled
    directly in plack.psgi.

    Signed-off-by: Arthur Suzuki <arthur.suzuki at biblibre.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0bc0aa708c5903c8ae2b7c45643600d0fc59ae03)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 1610c5101475274b6a9866fdc5c8211e7268b8f1
Author: Mason James <mtj at kohaaloha.com>
Date:   Tue Aug 25 18:08:28 2020 +1200

    Bug 16357: Plack error logs are not time stamped

    add libplack-middleware-logwarn-perl dependency to cpanfile

    Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 79b2b85f82875664e47cfff1cf1922605f94b03c)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 7317493c821295d35274105ae4bbf9d566277b39
Author: David Cook <dcook at prosentient.com.au>
Date:   Fri Jun 26 02:25:10 2020 +0000

    Bug 16357: Use separate Log4Perl logger for each Plack app

    This patch creates separate timestamped Log4Perl loggers
    for each Plack app, so that the Intranet, OPAC, and API are logged
    to separate files.

    To Test:
    0) apt-get install libplack-middleware-logwarn-perl
    1) Apply "Alternative" patches
    2) Copy PLACK block from etc/log4perl.conf to
    /etc/koha/sites/kohadev/log4perl.conf and replace __LOG_DIR__ appropriately
    3) Copy debian/templates/plack.psgi to /etc/koha/sites/kohadev/plack.psgi
    4) Temporarily add 'warn "TEST"' to opac-main.pl and mainpage.pl
    5) koha-plack --restart kohadev
    6) Go to /cgi-bin/koha/mainpage.pl and /cgi-bin/koha/opac-main.pl
    7) Open /var/log/koha/kohadev/plack-opac-error.log and
    /var/log/koha/kohadev/plack-intranet-error.log
    7) Observe a log line like the following:
    [2020/06/22 03:51:23] [WARN] TEST at <SCRIPT and line #>.

    Signed-off-by: Arthur Suzuki <arthur.suzuki at biblibre.com>
    Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ef021268bbe9519ac3eb070450591c2b761ac1c3)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit d8717c994ee37e298e80a4c0e4f83c35c6c62b9a
Author: David Cook <dcook at prosentient.com.au>
Date:   Mon Jun 22 03:53:16 2020 +0000

    Bug 16357: Override __WARN__ in Plack to use Log4Perl

    This patch overrides __WARN__ in Plack to use Log4Perl to add
    timestamps to error output. The Log4Perl config uses a screen
    appender so the output still goes to STDERR so that it is still
    managed by Starman.

    This patch adds a Plack::Middleware::LogWarn package dependency.
    (The dependency is very simplistic, so we could always do out own
     version if we would prefer to skip the external dependency.)

    To Test:
    0) apt-get install libplack-middleware-logwarn-perl
    1) Apply patch
    2) Copy PLACK block from etc/log4perl.conf to
    /etc/koha/sites/kohadev/log4perl.conf
    3) Copy debian/templates/plack.psgi to /etc/koha/sites/kohadev/plack.psgi
    4) Create some output on STDERR (it might be necessary to add
    a 'warn "TEST";' line to the intranet or OPAC)
    5) koha-plack --restart kohadev
    6) Open /var/log/koha/kohadev/plack-error.log
    7) Observe a log line like the following:
    [2020/06/22 03:51:23] [WARN] TEST at /kohadevbox/koha/opac/opac-user.pl line 59.

    Signed-off-by: Arthur Suzuki <arthur.suzuki at biblibre.com>
    Signed-off-by: Joonas Kylmälä <joonas.kylmala at helsinki.fi>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 57c62a612d7a8c590a2b5ef0ce75d9915471e19a)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

-----------------------------------------------------------------------

Summary of changes:
 cpanfile                               |  1 +
 debian/control                         |  2 ++
 debian/koha-common.postinst            | 48 ++++++++++++++++++++++++++++++++++
 debian/templates/log4perl-site.conf.in | 25 ++++++++++++++++++
 debian/templates/plack.psgi            | 29 +++++++++++++++++---
 etc/log4perl.conf                      | 25 ++++++++++++++++++
 6 files changed, 126 insertions(+), 4 deletions(-)

hooks/post-receive
-- 
main Koha release repository