Explorar o código

chore(boot): Do not ps -ef inspect node name

In case there are multiple nodes running
the current code (before this commit) will fail

If we choose to fix, it may stop the wrong node
Zaiming Shi %!s(int64=5) %!d(string=hai) anos
pai
achega
09c4f6eef0
Modificáronse 2 ficheiros con 1 adicións e 13 borrados
  1. 0 6
      bin/emqx
  2. 1 7
      bin/emqx_ctl

+ 0 - 6
bin/emqx

@@ -262,9 +262,6 @@ fi
 
 
 if [ -z "$NAME_ARG" ]; then
 if [ -z "$NAME_ARG" ]; then
     NODENAME="${EMQX_NODE_NAME:-}"
     NODENAME="${EMQX_NODE_NAME:-}"
-    # check if there is a node running, inspect its name
-    # shellcheck disable=SC2009 # pgrep does not support Extended Regular Expressions
-    [ -z "$NODENAME" ] && NODENAME=$(ps -ef | grep -E '\-progname\s.*emqx\s' | grep -o -E '\-name (\S*)' | awk '{print $2}')
     [ -z "$NODENAME" ] && NODENAME=$(grep -E '^[ \t]*node.name[ \t]*=[ \t]*' "$RUNNER_ETC_DIR/emqx.conf" 2> /dev/null | tail -1 | cut -d = -f 2-)
     [ -z "$NODENAME" ] && NODENAME=$(grep -E '^[ \t]*node.name[ \t]*=[ \t]*' "$RUNNER_ETC_DIR/emqx.conf" 2> /dev/null | tail -1 | cut -d = -f 2-)
     if [ -z "$NODENAME" ]; then
     if [ -z "$NODENAME" ]; then
         echoerr "vm.args needs to have a -name parameter."
         echoerr "vm.args needs to have a -name parameter."
@@ -287,9 +284,6 @@ PIPE_DIR="${PIPE_DIR:-/$RUNNER_DATA_DIR/${WHOAMI}_erl_pipes/$NAME/}"
 # Extract the target cookie
 # Extract the target cookie
 if [ -z "$COOKIE_ARG" ]; then
 if [ -z "$COOKIE_ARG" ]; then
     COOKIE="${EMQX_NODE_COOKIE:-}"
     COOKIE="${EMQX_NODE_COOKIE:-}"
-    # check if there is a node running, steal its cookie
-    # shellcheck disable=SC2009 # pgrep does not support Extended Regular Expressions
-    [ -z "$COOKIE" ] && COOKIE=$(ps -ef | grep -E '\-progname\s.*emqx\s' | grep -o -E '\-setcookie (\S*)' | awk '{print $2}')
     [ -z "$COOKIE" ] && COOKIE=$(grep -E '^[ \t]*node.cookie[ \t]*=[ \t]*' "$RUNNER_ETC_DIR/emqx.conf" 2> /dev/null | tail -1 | cut -d = -f 2-)
     [ -z "$COOKIE" ] && COOKIE=$(grep -E '^[ \t]*node.cookie[ \t]*=[ \t]*' "$RUNNER_ETC_DIR/emqx.conf" 2> /dev/null | tail -1 | cut -d = -f 2-)
     if [ -z "$COOKIE" ]; then
     if [ -z "$COOKIE" ]; then
         echoerr "vm.args needs to have a -setcookie parameter."
         echoerr "vm.args needs to have a -setcookie parameter."

+ 1 - 7
bin/emqx_ctl

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # -*- tab-width:4;indent-tabs-mode:nil -*-
 # -*- tab-width:4;indent-tabs-mode:nil -*-
 # ex: ts=4 sw=4 et
 # ex: ts=4 sw=4 et
 
 
@@ -34,9 +34,6 @@ relx_nodetool() {
 
 
 if [ -z "$NAME_ARG" ]; then
 if [ -z "$NAME_ARG" ]; then
     NODENAME="${EMQX_NODE_NAME:-}"
     NODENAME="${EMQX_NODE_NAME:-}"
-    # check if there is a node running, inspect its name
-    # shellcheck disable=SC2009 # pgrep does not support Extended Regular Expressions
-    [ -z "$NODENAME" ] && NODENAME=$(ps -ef | grep -E '\progname\s.*emqx\s' | grep -o -E '\-name (\S*)' | awk '{print $2}')
     [ -z "$NODENAME" ] && NODENAME=$(grep -E '^[ \t]*node.name[ \t]*=[ \t]*' "$RUNNER_ETC_DIR/emqx.conf" 2> /dev/null | tail -1 | cut -d = -f 2-)
     [ -z "$NODENAME" ] && NODENAME=$(grep -E '^[ \t]*node.name[ \t]*=[ \t]*' "$RUNNER_ETC_DIR/emqx.conf" 2> /dev/null | tail -1 | cut -d = -f 2-)
     if [ -z "$NODENAME" ]; then
     if [ -z "$NODENAME" ]; then
         echoerr "vm.args needs to have a -name parameter."
         echoerr "vm.args needs to have a -name parameter."
@@ -55,9 +52,6 @@ NAME="$(echo "$NAME_ARG" | awk '{print $2}')"
 # Extract the target cookie
 # Extract the target cookie
 if [ -z "$COOKIE_ARG" ]; then
 if [ -z "$COOKIE_ARG" ]; then
     COOKIE="${EMQX_NODE_COOKIE:-}"
     COOKIE="${EMQX_NODE_COOKIE:-}"
-    # check if there is a node running, steal its cookie
-    # shellcheck disable=SC2009 # pgrep does not support Extended Regular Expressions
-    [ -z "$COOKIE" ] && COOKIE=$(ps -ef | grep -E '\-progname\s.*emqx\s' | grep -o -E '\-setcookie (\S*)' | awk '{print $2}')
     [ -z "$COOKIE" ] && COOKIE=$(grep -E '^[ \t]*node.cookie[ \t]*=[ \t]*' "$RUNNER_ETC_DIR/emqx.conf" 2> /dev/null | tail -1 | cut -d = -f 2-)
     [ -z "$COOKIE" ] && COOKIE=$(grep -E '^[ \t]*node.cookie[ \t]*=[ \t]*' "$RUNNER_ETC_DIR/emqx.conf" 2> /dev/null | tail -1 | cut -d = -f 2-)
     if [ -z "$COOKIE" ]; then
     if [ -z "$COOKIE" ]; then
         echoerr "vm.args needs to have a -setcookie parameter."
         echoerr "vm.args needs to have a -setcookie parameter."