Attachment 679944 Details for Bug 885530 – adjust swift_action

[patch] adjust swift_action

0001-adjust-swift_action-to-the-previous-patch.patch (text/plain), 2.55 KB, created by Alan Pevec on 2013-01-17 00:36:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Pevec

Created: 2013-01-17 00:36:09 UTC

Size: 2.55 KB

patch

obsolete

>From e560f259c710198567848508d1bc1e23e74f16e3 Mon Sep 17 00:00:00 2001
>From: Alan Pevec <apevec@redhat.com>
>Date: Thu, 17 Jan 2013 01:29:58 +0100
>Subject: [PATCH] adjust swift_action to the previous patch
>
>Followup fix for rhbz#885530
>---
> openstack-swift-functions  | 20 +++++++++-----------
> openstack-swift-proxy.init |  6 +++---
> 2 files changed, 12 insertions(+), 14 deletions(-)
>
>diff --git a/openstack-swift-functions b/openstack-swift-functions
>index 4b69ed8..6d67a71 100644
>--- a/openstack-swift-functions
>+++ b/openstack-swift-functions
>@@ -5,20 +5,21 @@
> swift_action() {
>   retval=0
>   server="$1"
>-  call="swift_$2"
>+  subserv="$2"
>+  call="swift_$3"
> 
>   if [[ -f "/etc/swift/$server-server.conf" ]]; then
>-    $call "$server" \
>+    $call "$server-$subserv" \
>           "/etc/swift/$server-server.conf" \
>-          "/var/run/swift/$server-server.pid"
>+          "/var/run/swift/$server-$subserv.pid"
>     [ $? -ne 0 ] && retval=1
>   elif [[ -d "/etc/swift/$server-server/" ]]; then
>     declare -i count=0
>     mkdir -p /var/run/swift/$server-server
>     for name in $( ls "/etc/swift/$server-server/" ); do
>-      $call "$server" \
>+      $call "$server-$subserv" \
>             "/etc/swift/$server-server/$name" \
>-            "/var/run/swift/$server-server/$count.pid"
>+            "/var/run/swift/$server-$subserv/$count.pid"
>       [ $? -ne 0 ] && retval=1
>       count=$count+1
>     done
>@@ -27,8 +28,7 @@ swift_action() {
> }
> 
> swift_start() {
>-  name="$1"
>-  long_name="$name-server"
>+  long_name="$1"
>   conf_file="$2"
>   pid_file="$3"
> 
>@@ -42,8 +42,7 @@ swift_start() {
> }
> 
> swift_stop() {
>-  name="$1"
>-  long_name="$name-server"
>+  long_name="$1"
>   conf_name="$2"
>   pid_file="$3"
> 
>@@ -55,8 +54,7 @@ swift_stop() {
> }
> 
> swift_status() {
>-  name="$1"
>-  long_name="$name-server"
>+  long_name="$1"
>   conf_name="$2"
>   pid_file="$3"
> 
>diff --git a/openstack-swift-proxy.init b/openstack-swift-proxy.init
>index bac2df5..bba1f5e 100644
>--- a/openstack-swift-proxy.init
>+++ b/openstack-swift-proxy.init
>@@ -24,14 +24,14 @@ name="proxy"
> lockfile="/var/lock/subsys/openstack-swift-proxy"
> 
> start() {
>-    swift_action "$name" start
>+    swift_action "$name" "$subserv" start
>     retval=$?
>     [ $retval -eq 0 ] && touch $lockfile
>     return $retval
> }
> 
> stop() {
>-    swift_action "$name" stop
>+    swift_action "$name" "$subserv" stop
>     retval=$?
>     [ $retval -eq 0 ] && rm -f $lockfile
>     return $retval
>@@ -43,7 +43,7 @@ restart() {
> }
> 
> rh_status() {
>-    swift_action "$name" status
>+    swift_action "$name" "$subserv" status
> }
> 
> rh_status_q() {
>-- 
>1.7.11.7
>

Flags:

zaitcev: review+

Actions: View | Diff

Attachments on bug 885530: 676016 | 679944 | 682936