From: Michael Adam <obnox@samba.org>
Date: Tue, 12 Jan 2016 17:59:15 +0000 (+0100)
Subject: ctdb-scripts: further untangle logic for success of interface monitoring
X-Git-Url: http://git.samba.org/?p=obnox%2Fsamba%2Fsamba-obnox.git;a=commitdiff_plain;h=19fffeb75a5b9e352f67cfdfbd45d0ac8ad5e4a3

ctdb-scripts: further untangle logic for success of interface monitoring

Reduces intentation by using early returns.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Thu Jan 14 22:41:29 CET 2016 on sn-devel-144
---

diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface
index 4b9f31c5a2b..00b5f97d3e6 100755
--- a/ctdb/config/events.d/10.interface
+++ b/ctdb/config/events.d/10.interface
@@ -152,16 +152,19 @@ monitor_interfaces()
 
 	done
 
-	if $fail ; then
-	    if $up_interfaces_found && \
-		    [ "$CTDB_PARTIALLY_ONLINE_INTERFACES" = "yes" ] ; then
+	if ! $fail ; then
 		return 0
-	    else
+	fi
+
+	if ! $up_interfaces_found ; then
+		return 1
+	fi
+
+	if [ "$CTDB_PARTIALLY_ONLINE_INTERFACES" != "yes" ]; then
 		return 1
-	    fi
-	else
-	    return 0
 	fi
+
+	return 0
 }
 
 # Sets: iface, ip, maskbits, family