ctdb-scripts: Simplify the names of NFS fail counter files

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

diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs
index b7775db6449f8561be0aae56891d0aa78bb924e3..f630a3d861ef080866f33489392a018be45d8531 100755 (executable)
--- a/ctdb/config/events.d/60.nfs
+++ b/ctdb/config/events.d/60.nfs
@@ -119,8 +119,6 @@ nfs_check_service ()
            esac
        done
 
-       _service_name="nfs_${_progname}"
-
        _ok=false
        if [ -n "$service_check_cmd" ] ; then
            # Using eval means variables can contain semicolon separated commands
@@ -140,13 +138,13 @@ nfs_check_service ()
 
        if $_ok ; then
            if [ $unhealthy_after -ne 1 -o $restart_every -ne 0 ] ; then
-               ctdb_counter_init "$_service_name"
+               ctdb_counter_init "$_progname"
            fi
            exit 0
        fi
 
-       ctdb_counter_incr "$_service_name"
-       _failcount=$(ctdb_counter_get "$_service_name")
+       ctdb_counter_incr "$_progname"
+       _failcount=$(ctdb_counter_get "$_progname")
 
        _unhealthy=false
        if [ "$unhealthy_after" -gt 0 ] ; then