Attachment 66426 Details for Bug 17467 – [SIGNED-OFF] Bug 17467: Restart failing, missing instance parameter

[patch] [SIGNED-OFF] Bug 17467: Restart failing, missing instance parameter

SIGNED-OFF-Bug-17467-Restart-failing-missing-insta.patch (text/plain), 1.47 KB, created by Josef Moravec on 2017-08-24 14:16:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2017-08-24 14:16:05 UTC

Size: 1.47 KB

patch

obsolete

>From 76389c4b1ce9f7674f2163b9ae429d6874477b14 Mon Sep 17 00:00:00 2001
>From: Mark Tompsett <mtompset@hotmail.com>
>Date: Sun, 1 Jan 2017 07:17:55 +0000
>Subject: [PATCH] [SIGNED-OFF] Bug 17467: Restart failing, missing instance
> parameter
>
>This follow up should make it work. Perhaps there is a more
>elegant way, but wanted to generate something that works.
>
>Before this patch, the --restart stops Zebra, but does not
>restart it. After, it does restart.
>
>Before this patch, the --status gives nasty long help.
>After this patch, reasonable output.
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>---
> debian/scripts/koha-zebra | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/debian/scripts/koha-zebra b/debian/scripts/koha-zebra
>index 3a8f662..944e2e1 100755
>--- a/debian/scripts/koha-zebra
>+++ b/debian/scripts/koha-zebra
>@@ -134,9 +134,10 @@ restart_zebra()
>     local name=$1
> 
>     if is_zebra_running ${name}; then
>-
>-        stop_zebra ${name} && \
>-        start_zebra ${name}
>+        local noLF="-n"
>+        [ "$verbose" != "no" ] && noLF=""
>+        echo $noLF `stop_zebra ${name}`
>+        echo $noLF `start_zebra ${name}`
>     else
>         if [ "$verbose" != "no" ]; then
>             log_daemon_msg "Error: Zebra not running for ${name}"
>@@ -149,7 +150,7 @@ zebra_status()
> {
>     local name=$1
> 
>-    if is_zebra_running; then
>+    if is_zebra_running ${name}; then
>         log_daemon_msg "Zebra running for ${name}"
>         log_end_msg 0
>     else
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 17467: 56662 | 56663 | 56664 | 56665 | 56669 | 56693 | 58550 | 66420 | 66421 | 66422 | 66423 | 66424 | 66425 | 66426 | 68623 | 68624 | 68625 | 68626 | 68627 | 68628 | 68629