From d13a33463fc50c2f3f56d76e70bd5116dc3e2ddc Mon Sep 17 00:00:00 2001
From: Zaiming Shi <zmstone@gmail.com>
Date: Thu, 28 Jan 2021 13:54:50 +0100
Subject: [PATCH] chore(bin/emqx): set program name

---
 bin/emqx                        | 2 ++
 deploy/packages/rpm/init.script | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/emqx b/bin/emqx
index 44d9f439b..4ee6a508d 100755
--- a/bin/emqx
+++ b/bin/emqx
@@ -264,6 +264,8 @@ fi
 # Extract the name type and name from the NAME_ARG for REMSH
 NAME_TYPE="$(echo "$NAME_ARG" | awk '{print $1}')"
 NAME="$(echo "$NAME_ARG" | awk '{print $2}')"
+NODENAME="$(echo "$NAME" | awk -F'@' '{print $1}')"
+export ESCRIPT_NAME="$NODENAME"
 
 PIPE_DIR="${PIPE_DIR:-/$RUNNER_DATA_DIR/${WHOAMI}_erl_pipes/$NAME/}"
 
diff --git a/deploy/packages/rpm/init.script b/deploy/packages/rpm/init.script
index 33ff030a5..bdca033a2 100755
--- a/deploy/packages/rpm/init.script
+++ b/deploy/packages/rpm/init.script
@@ -38,7 +38,7 @@ status -p $pidfile -l $(basename $lockfile) $NAME >/dev/null 2>&1
 running=$?
 
 find_pid() {
-    ps ax | grep -E "\-progname.+$NAME" | awk '{print $1}'
+    ps ax | grep -E "\-progname\s+$NAME\s" | awk '{print $1}'
 }
 
 check_pid_status() {
@@ -92,7 +92,7 @@ stop() {
 
 hardstop() {
     echo -n $"Shutting down $NAME: "
-    su - emqx -c "ps -ef | grep '\-progname $NAME ' | grep -v grep | awk '{print \$2}' | xargs kill -9"
+    su - emqx -c "ps -ef | grep -E '\-progname\s+$NAME\s' | awk '{print \$2}' | xargs kill -9"
     for n in $(seq 1 10); do
         sleep 1
         check_pid_status