From: Martin Schwenke <martin@meltin.net>
Date: Sat, 17 Dec 2016 20:59:03 +0000 (+1100)
Subject: ctdb-scripts: Inline simple uses of service_start() and service_stop()
X-Git-Tag: talloc-2.1.9~384
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8249dfa0e72ece7d816ecf822a78843deabfeaa;p=thirdparty%2Fsamba.git

ctdb-scripts: Inline simple uses of service_start() and service_stop()

This makes the scripts more readable.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/config/events.d/31.clamd b/ctdb/config/events.d/31.clamd
index 815091443da..1b7636541ae 100755
--- a/ctdb/config/events.d/31.clamd
+++ b/ctdb/config/events.d/31.clamd
@@ -23,23 +23,18 @@ redhat)
 	;;
 esac
 
-service_start ()
-{
-    service $service_name stop > /dev/null 2>&1
-    service $service_name start
-}
-
 loadconfig
 
 is_ctdb_managed_service || exit 0
 
 case "$1" in
 startup)
-	service_start
+	service "$service_name" stop > /dev/null 2>&1
+	service "$service_name" start || exit $?
 	;;
 
 shutdown)
-	service_stop
+	service "$service_name"_stop
 	;;
 
 monitor)
diff --git a/ctdb/config/events.d/40.vsftpd b/ctdb/config/events.d/40.vsftpd
index 6be00053e9d..f3c4848b438 100755
--- a/ctdb/config/events.d/40.vsftpd
+++ b/ctdb/config/events.d/40.vsftpd
@@ -7,16 +7,6 @@
 . "${CTDB_BASE}/functions"
 
 service_name="vsftpd"
-# make sure the service is stopped first
-service_start ()
-{
-    service $service_name stop > /dev/null 2>&1
-    service $service_name start
-}
-service_stop ()
-{
-    service $service_name stop
-}
 
 service_reconfigure ()
 {
@@ -29,12 +19,13 @@ is_ctdb_managed_service || exit 0
 
 case "$1" in
 startup)
-	service_start
+	service "$service_name" stop > /dev/null 2>&1
+	service "$service_name" start
 	ctdb_counter_init
 	;;
 
 shutdown)
-	service_stop
+	service "$service_name" stop
 	;;
 
 takeip|releaseip)