|
 |
e87a70 |
From 0a197f1cd227e768837dff778a0c56fc1085d434 Mon Sep 17 00:00:00 2001
|
|
|
e87a70 |
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
|
|
e87a70 |
Date: Mon, 21 Feb 2022 13:54:04 +0100
|
|
|
e87a70 |
Subject: [PATCH] IPsrcaddr: fix indentation in better error message code
|
|
|
e87a70 |
|
|
|
e87a70 |
---
|
|
|
e87a70 |
heartbeat/IPsrcaddr | 30 +++++++++++++++---------------
|
|
|
e87a70 |
1 file changed, 15 insertions(+), 15 deletions(-)
|
|
|
e87a70 |
|
|
|
e87a70 |
diff --git a/heartbeat/IPsrcaddr b/heartbeat/IPsrcaddr
|
|
|
e87a70 |
index f0216722d..c82adc0e9 100755
|
|
|
e87a70 |
--- a/heartbeat/IPsrcaddr
|
|
|
e87a70 |
+++ b/heartbeat/IPsrcaddr
|
|
|
e87a70 |
@@ -542,27 +542,27 @@ fi
|
|
|
e87a70 |
findif_out=`$FINDIF -C`
|
|
|
e87a70 |
rc=$?
|
|
|
e87a70 |
[ $rc -ne 0 ] && {
|
|
|
e87a70 |
- ocf_exit_reason "[$FINDIF -C] failed"
|
|
|
e87a70 |
- exit $rc
|
|
|
e87a70 |
+ ocf_exit_reason "[$FINDIF -C] failed"
|
|
|
e87a70 |
+ exit $rc
|
|
|
e87a70 |
}
|
|
|
e87a70 |
|
|
|
e87a70 |
INTERFACE=`echo $findif_out | awk '{print $1}'`
|
|
|
e87a70 |
if [ "$OCF_RESKEY_destination" = "0.0.0.0/0" ] ;then
|
|
|
e87a70 |
NETWORK=`$IP2UTIL route list dev $INTERFACE scope link $PROTO match $ipaddress|grep -m 1 -o '^[^ ]*'`
|
|
|
e87a70 |
|
|
|
e87a70 |
- if [ -z "$NETWORK" ]; then
|
|
|
e87a70 |
- err_str="command '$IP2UTIL route list dev $INTERFACE scope link $PROTO"
|
|
|
e87a70 |
- err_str="$err_str match $ipaddress' failed to find a matching route"
|
|
|
e87a70 |
-
|
|
|
e87a70 |
- if [ "$__OCF_ACTION" = "start" ]; then
|
|
|
e87a70 |
- ocf_exit_reason "$err_str"
|
|
|
e87a70 |
- exit $OCF_ERR_ARGS
|
|
|
e87a70 |
- elif ! ocf_is_probe; then
|
|
|
e87a70 |
- ocf_log warn "$err_str"
|
|
|
e87a70 |
- else
|
|
|
e87a70 |
- ocf_log debug "$err_str"
|
|
|
e87a70 |
- fi
|
|
|
e87a70 |
- fi
|
|
|
e87a70 |
+ if [ -z "$NETWORK" ]; then
|
|
|
e87a70 |
+ err_str="command '$IP2UTIL route list dev $INTERFACE scope link $PROTO"
|
|
|
e87a70 |
+ err_str="$err_str match $ipaddress' failed to find a matching route"
|
|
|
e87a70 |
+
|
|
|
e87a70 |
+ if [ "$__OCF_ACTION" = "start" ]; then
|
|
|
e87a70 |
+ ocf_exit_reason "$err_str"
|
|
|
e87a70 |
+ exit $OCF_ERR_ARGS
|
|
|
e87a70 |
+ elif ! ocf_is_probe; then
|
|
|
e87a70 |
+ ocf_log warn "$err_str"
|
|
|
e87a70 |
+ else
|
|
|
e87a70 |
+ ocf_log debug "$err_str"
|
|
|
e87a70 |
+ fi
|
|
|
e87a70 |
+ fi
|
|
|
e87a70 |
else
|
|
|
e87a70 |
NETWORK="$OCF_RESKEY_destination"
|
|
|
e87a70 |
fi
|