ctdb-scripts: Drop use of service_tcp_ports

This makes the logic more obvious.

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

diff --git a/ctdb/config/events.d/40.vsftpd b/ctdb/config/events.d/40.vsftpd
index 64da6fd16d2984112735e7431c543051910b9602..cdc99830bebb4a1ddc5460d4c61a50e482934c74 100755 (executable)
--- a/ctdb/config/events.d/40.vsftpd
+++ b/ctdb/config/events.d/40.vsftpd
@@ -24,7 +24,6 @@ service_reconfigure ()
 }
 
 service_fail_limit=2
-service_tcp_ports=21
 
 loadconfig
 
@@ -48,16 +47,14 @@ takeip|releaseip)
        ;;
 
 monitor)
-       if [ -n "$service_tcp_ports" ] ; then
-           if ctdb_check_tcp_ports $service_tcp_ports ; then
+       if ctdb_check_tcp_ports 21 ; then
                ctdb_counter_init
-           else
+       else
                ctdb_counter_incr
                ctdb_check_counter
                ctdb_check_counter "quiet" -ge 1 || \
-                   echo "WARNING: vsftpd not listening but less than $service_fail_limit consecutive failures, not unhealthy yet" 
-           fi
-       fi      
+                   echo "WARNING: vsftpd not listening but less than $service_fail_limit consecutive failures, not unhealthy yet"
+       fi
        ;;
 esac