Attachment 36508 Details for Bug 13784 – Koha-stop-zebra should also work for disabled instances

[patch] Koha-stop-zebra should also work for disabled instances

Koha-stop-zebra-should-also-work-for-disabled-inst.patch (text/plain), 1.99 KB, created by Mirko Tietgen on 2015-03-04 19:00:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mirko Tietgen

Created: 2015-03-04 19:00:33 UTC

Size: 1.99 KB

patch

obsolete

>From c545ca319fe09b4554f135fb7c44038c590d267f Mon Sep 17 00:00:00 2001
>From: Larry Baerveldt <larry@bywatersolutions.com>
>Date: Tue, 3 Mar 2015 05:49:57 -0800
>Subject: [PATCH] Koha-stop-zebra should also work for disabled instances
>
>Currently koha-stop-zebra will not stop zebra for disabled instances. It should
>work more like koha-stop-sip, which does work for disabled instances. Also,
>koha-stop-zebra is called by '/etc/init.d/koha-common stop' which clearly
>should also apply to disabled instances.
>
>To Test:
>1) Disable a koha instance.
>2) Run koha-stop-zebra INSTANCE. You should get message
>   "Instance INSTANCE disabled. No action taken."
>3) Apply patch, and copy patched file debian/scripts/koha-stop-zebra
>   to package site over /usr/sbin/koha-stop-zebra.
>4) Disable koha instance.
>5) Run koha-stop-zebra INSTANCE. It should now stop zebra.
>
>http://bugs.koha-community.org/show_bug.cgi?id=13784
>Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
>---
> debian/scripts/koha-stop-zebra |   12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
>diff --git a/debian/scripts/koha-stop-zebra b/debian/scripts/koha-stop-zebra
>index cf5084d..10c8b78 100755
>--- a/debian/scripts/koha-stop-zebra
>+++ b/debian/scripts/koha-stop-zebra
>@@ -67,16 +67,12 @@ EOF
> for name in "$@"
> do
>     if is_instance $name ; then
>-        if is_enabled $name ; then
>-            if is_zebra_running $name; then
>-                if ! stop_zebra_instance $name; then
>-                    warn "Something went wrong stopping Zebra for $name."
>-                fi
>-            else
>-                warn "Zebra already stopped for instance $name."
>+        if is_zebra_running $name; then
>+            if ! stop_zebra_instance $name; then
>+                warn "Something went wrong stopping Zebra for $name."
>             fi
>         else
>-            warn "Instance $name disabled. No action taken."
>+            warn "Zebra already stopped for instance $name."
>         fi
>     else
>         warn "Unknown instance $name."
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 13784: 36412 | 36508 | 36520 | 36728 | 36729 | 36730