Attachment 36731 Details for Bug 13785 – Bug 13785: koha-disable should also stop SIP and zebra for instance

[patch] Bug 13785: koha-disable should also stop SIP and zebra for instance

Bug-13785-koha-disable-should-also-stop-SIP-and-ze.patch (text/plain), 1.70 KB, created by Tomás Cohen Arazi (tcohen) on 2015-03-07 21:27:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2015-03-07 21:27:55 UTC

Size: 1.70 KB

patch

obsolete

>From 529a8de73d504e59fe0c5ae635a3681dae1842c6 Mon Sep 17 00:00:00 2001
>From: Larry Baerveldt <larry@bywatersolutions.com>
>Date: Tue, 3 Mar 2015 07:33:21 -0800
>Subject: [PATCH] Bug 13785: koha-disable should also stop SIP and zebra for
> instance
>
>Currently koha-disable ONLY disables the instance in the apache conf
>file. Presumably if you want to disable the instance, you also want
>its processes to stop, so this patch will stop zebra, if running,
>and SIP, if enabled.
>
>Depends on Bug 13784.
>
>To Test:
>1) Have an enabled instance, with zebra and SIP running.
>2) Run koha-disable INST. Note that after, both zebra and SIP
>   will still be running.
>3) Re-enable INST.
>4) Apply patch, and then copy debian/scripts/koha-disable to
>   package site, over /usr/sbin/koha-disable.
>5) Run koha-disable INST. You should now see that both zebra
>   and SIP have been stopped.
>
>Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
>Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
>---
> debian/scripts/koha-disable | 6 ++++++
> 1 file changed, 6 insertions(+)
>
>diff --git a/debian/scripts/koha-disable b/debian/scripts/koha-disable
>index b03ed80..cef45d8 100755
>--- a/debian/scripts/koha-disable
>+++ b/debian/scripts/koha-disable
>@@ -63,6 +63,12 @@ do
>         RET=$(disable_instance $name)
>         if [ "$RET" = 0 ]; then
>             restart_apache="yes"
>+            if is_sip_enabled $name; then
>+                koha-stop-sip $name
>+            fi
>+            if is_zebra_running $name; then
>+                koha-stop-zebra $name
>+            fi
>         elif [ "$RET" = 2 ]; then
>             warn "Error: Apache configuration file not present for instance $name."
>         else
>-- 
>2.3.2

Actions: View | Diff | Splinter Review

Attachments on bug 13785: 36413 | 36509 | 36518 | 36519 | 36731 | 36732