Event scripts: use $script_name rather than $service name for status.

Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 517e9d9b188b18dffc712a8fecddb41540d27b8d)

diff --git a/ctdb/config/functions b/ctdb/config/functions
index 66ead7cfff318cbdf50f16172038db987a5b73d0..93b50af525971fff994232ec316f7f586820022c 100644 (file)
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -461,16 +461,16 @@ ctdb_active_dir="$ctdb_spool_dir/active"
 
 log_status_cat ()
 {
-    echo "node is \"$1\", problem with \"${service_name}\": $(cat $2)"
+    echo "node is \"$1\", problem with \"${script_name}\": $(cat $2)"
 }
 
 ctdb_checkstatus ()
 {
-    if [ -r "$ctdb_status_dir/$service_name/unhealthy" ] ; then
-       log_status_cat "unhealthy" "$ctdb_status_dir/$service_name/unhealthy"
+    if [ -r "$ctdb_status_dir/$script_name/unhealthy" ] ; then
+       log_status_cat "unhealthy" "$ctdb_status_dir/$script_name/unhealthy"
        return 1
-    elif [ -r "$ctdb_status_dir/$service_name/banned" ] ; then
-       log_status_cat "banned" "$ctdb_status_dir/$service_name/banned"
+    elif [ -r "$ctdb_status_dir/$script_name/banned" ] ; then
+       log_status_cat "banned" "$ctdb_status_dir/$script_name/banned"
        return 2
     else
        return 0
@@ -479,7 +479,7 @@ ctdb_checkstatus ()
 
 ctdb_setstatus ()
 {
-    d="$ctdb_status_dir/$service_name"
+    d="$ctdb_status_dir/$script_name"
     case "$1" in
        unhealthy|banned)
            mkdir -p "$d"
@@ -601,7 +601,8 @@ ctdb_service_stop ()
 }
 
 # A reasonable default is the basename of the eventscript.
-service_name="${0##*/}" # basename
+script_name="${0##*/}" # basename
+service_name="$script_name"
 service_fail_limit=1
 
 ctdb_event="$1" ; shift