ctdb-scripts: Clarify logic for success of interface monitoring

The current code uses so many shell idioms that it is difficult to follow. Signed-off-by: Martin Schwenke <[email protected]> Reviewed-by: Michael Adam <[email protected]>
gabrielmansi · Jan 12, 2016 · c23744c · c23744c
1 parent d8e4c5a
commit c23744c
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface
@@ -152,13 +152,16 @@ monitor_interfaces()
 
 	done
 
-	$fail || return 0
-
-	$up_interfaces_found && \
-	    [ "$CTDB_PARTIALLY_ONLINE_INTERFACES" = "yes" ] && \
+	if $fail ; then
+	    if $up_interfaces_found && \
+		    [ "$CTDB_PARTIALLY_ONLINE_INTERFACES" = "yes" ] ; then
+		return 0
+	    else
+		return 1
+	    fi
+	else
 	    return 0
-
-	return 1
+	fi
 }
 
 # Sets: iface, ip, maskbits, family