Bugzilla – Attachment 17829 Details for
Bug 10144
koha-start-zebra error handling
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Signed off patch
0001-Bug-10144-koha-start-zebra-error-handling.patch (text/plain), 4.07 KB, created by
Chris Cormack
on 2013-04-30 04:11:55 UTC
(
hide
)
Description:
Signed off patch
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2013-04-30 04:11:55 UTC
Size:
4.07 KB
patch
obsolete
>From af968af4a2965ac11721c9778cc0915de511023a Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@gmail.com> >Date: Mon, 29 Apr 2013 10:30:08 -0300 >Subject: [PATCH] Bug 10144 - koha-start-zebra error handling >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >koha-start-zebra now >- Checks the instance exists. >- Checks the instance is enabled. >- Checks if the zebra daemon is already running. > >Regards >To+ > >Sponsored-by: Universidad Nacional de Córdoba >Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> >--- > debian/scripts/koha-start-zebra | 126 ++++++++++++++++++++++++++++++++++----- > 1 file changed, 111 insertions(+), 15 deletions(-) > >diff --git a/debian/scripts/koha-start-zebra b/debian/scripts/koha-start-zebra >index 52c6041..b5e7c6c 100755 >--- a/debian/scripts/koha-start-zebra >+++ b/debian/scripts/koha-start-zebra >@@ -1,6 +1,6 @@ > #!/bin/sh > # >-# koha-start-zebra -- Start Zebra for named Koha instandes >+# koha-start-zebra - Start Zebra for named Koha instances > # Copyright 2010 Catalyst IT, Ltd > # > # This program is free software: you can redistribute it and/or modify >@@ -18,20 +18,116 @@ > > set -e > >+die() >+{ >+ echo "$@" 1>&2 >+ exit 1 >+} >+ >+warn() >+{ >+ echo "$@" 1>&2 >+} >+ >+is_enabled() >+{ >+ local instancename=$1 >+ >+ if ! is_instance $instancename; then >+ return 1 >+ fi >+ >+ if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \ >+ "/etc/apache2/sites-available/$instancename" ; then >+ return 1 >+ else >+ return 0 >+ fi >+} >+ >+is_instance() >+{ >+ local instancename=$1 >+ >+ if find /etc/koha/sites -mindepth 1 -maxdepth 1 \ >+ -type d -printf '%f\n'\ >+ | grep -q -x $instancename ; then >+ return 0 >+ else >+ return 1 >+ fi >+} >+ >+is_zebra_running() >+{ >+ local instancename=$1 >+ >+ if daemon --name="$instancename-koha-zebra" \ >+ --user="$instancename-koha.$instancename-koha" \ >+ --running ; then >+ return 0 >+ else >+ return 1 >+ fi >+} >+ >+start_zebra_instance() >+{ >+ local instancename=$1 >+ >+ if is_enabled $instancename; then >+ echo "Starting Zebra server for $instancename" >+ daemon \ >+ --name="$instancename-koha-zebra" \ >+ --errlog="/var/log/koha/$instancename/zebra-error.log" \ >+ --stdout="/var/log/koha/$instancename/zebra.log" \ >+ --output="/var/log/koha/$instancename/zebra-output.log" \ >+ --verbose=1 \ >+ --respawn \ >+ --delay=30 \ >+ --user="$instancename-koha.$instancename-koha" \ >+ -- \ >+ zebrasrv \ >+ -v none,fatal,warn \ >+ -f "/etc/koha/sites/$instancename/koha-conf.xml" && \ >+ return 0 >+ else >+ return 1 >+ fi >+} >+ >+usage() >+{ >+ local scriptname=$0 >+ cat <<EOF >+Starts Zebra for Koha instances. >+ >+Usage: $scriptname instancename1 instancename2... >+ >+EOF >+} >+ >+# Parse command line. >+[ $# -ge 1 ] || ( usage ; die "Missing instance name..." ) >+ >+# Loop through the instance names > for name in "$@" > do >- echo "Starting Zebra server for $name" >- daemon \ >- --name="$name-koha-zebra" \ >- --errlog="/var/log/koha/$name/zebra-error.log" \ >- --stdout="/var/log/koha/$name/zebra.log" \ >- --output="/var/log/koha/$name/zebra-output.log" \ >- --verbose=1 \ >- --respawn \ >- --delay=30 \ >- --user="$name-koha.$name-koha" \ >- -- \ >- zebrasrv \ >- -v none,fatal,warn \ >- -f "/etc/koha/sites/$name/koha-conf.xml" >+ 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." >+ fi >+ else >+ warn "Instance $name disabled. No action taken." >+ fi >+ else >+ warn "Unknown instance $name." >+ fi > done >+ >+exit 0 >-- >1.7.10.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10144
:
17786
|
17809
|
17829
|
17839