[koha-commits] main Koha release repository branch master updated. v3.22.00-637-gaf6488b

[Git repo owner]

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, master has been updated
       via  af6488b157f85f3f12a84ac70da5524b4b4119b3 (commit)
       via  741252362450aedc8903ef75658b4c5342f8e6f9 (commit)
       via  dbb24a676e8a8d96f20a9c1c66fdf5fd08ba1d4c (commit)
      from  e51fe4a8f1a604453302b68cb2ff8bf1b0fb3fc7 (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 af6488b157f85f3f12a84ac70da5524b4b4119b3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Feb 3 15:59:02 2016 +0100

    Bug 15714: Add zebra_loglevels to koha-conf.xml
    
    This patch adds a commented zebra_loglevels line to the config file.
    Behavior does not change, but an admin can easily edit the variable.
    
    Test plan:
    Nothing really changed. But if you are not so sure about that, apply the
    change to /etc/koha/koha-conf-site.xml.in and run koha-create. Check
    that the new koha-conf contains the line and is not messed up.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 741252362450aedc8903ef75658b4c5342f8e6f9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Feb 2 16:40:06 2016 +0100

    Bug 15714: Remove zebra.log and add loglevels
    
    The file zebra.log is actually not used, because daemon's --output
    parameter sends all message to zebra-output (making that stdout
    goes there too and --stdout does nothing). We do not need any
    differentiation (if any at all) here; behavior does not change.
    
    Note: zebra-error will only contain the daemon's error messages and not
    the zebra error messages! So you will probably only find messages about
    stopping zebra in zebra-error.
    
    The loglevels are by default none,fatal,warn and can be changed via the
    zebra_loglevels config variable (read by koha-functions.sh). If you remove
    'none', you will have request-messages in the log. You can also keep 'none'
    and add 'request' to achieve something similar (undocumented however).
    
    Some of the parameters passed to daemon when stopping zebra are
    superfluous and have been removed.
    
    Test plan:
    [1] Remove the file zebra.log. Look at last lines in zebra-error and
        zebra-output.
    [2] Remove zebra_loglevels from koha-conf (if present).
        Start/restart Zebra. Search to verify if Zebra runs.
        Stop Zebra and check zebra-error for a new line (killed by signal 15).
    [3] Add fatal,warn in koha-conf:zebra_loglevels (do not include 'none').
        Start Zebra. Check zebra-output for a line "[log] zebra_start".
        Do a search and check zebra-output for lines with "[request]".
    [4] Verify that zebra.log did not appear again.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit dbb24a676e8a8d96f20a9c1c66fdf5fd08ba1d4c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Feb 1 15:36:26 2016 +0100

    Bug 15714: Add get_loglevels to koha-functions.sh
    
    Preparing for including different log levels in koha-start-zebra.
    Note that the default response is none,fatal,warn; this is equal
    to the options passed to zebrasrv in koha-start-zebra (for now).
    
    Test plan:
    [1] Run on the command line: source koha-functions.sh
    [2] Type get_loglevels [your_instance]
        By default, you should see: none,fatal,warn
    [3] Add this line to your koha-conf:
        <zebra_loglevels>how,are,you</zebra_loglevels>
    [4] Run get_loglevels [your_instance] again.
        Remove the nonsense log levels again..
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

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

Summary of changes:
 debian/scripts/koha-functions.sh       |   12 ++++++++++++
 debian/scripts/koha-start-zebra        |    8 ++++----
 debian/scripts/koha-stop-zebra         |    8 --------
 debian/templates/koha-conf-site.xml.in |    5 +++++
 4 files changed, 21 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
main Koha release repository