Attachment 36730 Details for Bug 13784 – Bug 13784: (QA followup) allow running Zebra for disabled instances on packages

[patch] Bug 13784: (QA followup) allow running Zebra for disabled instances on packages

Bug-13784-QA-followup-allow-running-Zebra-for-disa.patch (text/plain), 2.70 KB, created by Tomás Cohen Arazi (tcohen) on 2015-03-07 20:48:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2015-03-07 20:48:57 UTC

Size: 2.70 KB

patch

obsolete

>From ee3c31076b93eb2a724bd3a62e6f9f5c750cff72 Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@gmail.com>
>Date: Sat, 7 Mar 2015 21:35:36 +0100
>Subject: [PATCH] Bug 13784: (QA followup) allow running Zebra for disabled
> instances on packages
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
>---
> debian/scripts/koha-restart-zebra | 19 +++++++------------
> debian/scripts/koha-start-zebra   | 12 ++++--------
> 2 files changed, 11 insertions(+), 20 deletions(-)
>
>diff --git a/debian/scripts/koha-restart-zebra b/debian/scripts/koha-restart-zebra
>index 1c8ace9..866dafd 100755
>--- a/debian/scripts/koha-restart-zebra
>+++ b/debian/scripts/koha-restart-zebra
>@@ -95,21 +95,16 @@ EOF
> for name in "$@"
> do
>     if is_instance $name ; then
>-        if is_enabled $name ; then
>+        if ! is_zebra_running $name; then
>+            warn "Zebra does not appear to have been running for instance $name."
> 
>-            if ! is_zebra_running $name; then
>-                warn "Zebra does not appear to have been running for instance $name."
>-
>-                if ! start_zebra_instance $name ; then
>-                    warn "Something went wrong starting Zebra for $name."
>-                fi
>-            else
>-                if ! restart_zebra_instance $name; then
>-                  warn "Something went wrong restarting Zebra for $name."
>-                fi
>+            if ! start_zebra_instance $name ; then
>+                warn "Something went wrong starting Zebra for $name."
>             fi
>         else
>-            warn "Instance $name disabled. No action taken."
>+            if ! restart_zebra_instance $name; then
>+              warn "Something went wrong restarting Zebra for $name."
>+            fi
>         fi
>     else
>         warn "Unknown instance $name."
>diff --git a/debian/scripts/koha-start-zebra b/debian/scripts/koha-start-zebra
>index 7d25b81..185a650 100755
>--- a/debian/scripts/koha-start-zebra
>+++ b/debian/scripts/koha-start-zebra
>@@ -73,16 +73,12 @@ EOF
> for name in "$@"
> do
>     if is_instance $name ; then
>-        if is_enabled $name ; then
>-            if ! is_zebra_running $name; then
>-                if ! start_zebra_instance $name; then
>-                    warn "Something went wrong starting Zebra for $name."
>-                fi
>-            else
>-                warn "Zebra already running for instance $name."
>+        if ! is_zebra_running $name; then
>+            if ! start_zebra_instance $name; then
>+                warn "Something went wrong starting Zebra for $name."
>             fi
>         else
>-            warn "Instance $name disabled. No action taken."
>+            warn "Zebra already running for instance $name."
>         fi
>     else
>         warn "Unknown instance $name."
>-- 
>2.3.2

Actions: View | Diff | Splinter Review

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