yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(bin/emqx): configure mnesia dir in vm.args file

This commit is contained in:
Zaiming (Stone) Shi 2022-04-13 21:25:13 +02:00
parent 3c03c0cfc1
commit 82ef4c87e5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/emqx
View File

@ -460,6 +460,7 @@ generate_config() {
fi fi
done done
echo "$name_type $node_name" >> "$TMP_ARG_FILE" echo "$name_type $node_name" >> "$TMP_ARG_FILE"
echo "-mnesia dir '\"$DATA_DIR/mnesia/$NAME\"'" >> "$TMP_ARG_FILE"
## rename the generated vm.<time>.args file ## rename the generated vm.<time>.args file
mv -f "$TMP_ARG_FILE" "$ARGS_FILE" mv -f "$TMP_ARG_FILE" "$ARGS_FILE"
} }
@ -626,7 +627,6 @@ fi
# force to use 'emqx' short name # force to use 'emqx' short name
[ -z "$NAME" ] && NAME='emqx' [ -z "$NAME" ] && NAME='emqx'
MNESIA_DATA_DIR="$DATA_DIR/mnesia/$NAME"
case "$NAME" in case "$NAME" in
*@*) *@*)
@ -863,12 +863,11 @@ case "${COMMAND}" in
then then
set -- "$REL_DIR/iex" \ set -- "$REL_DIR/iex" \
--boot "$BOOTFILE" \ --boot "$BOOTFILE" \
--boot-var RELEASE_LIB "$ERTS_LIB_DIR" \ --boot-var RELEASE_LIB "${ERTS_LIB_DIR}" \
--erl-config "${CONF_FILE}" \ --erl-config "${CONF_FILE}" \
--vm-args "${ARGS_FILE}" \ --vm-args "${ARGS_FILE}" \
--erl "$FOREGROUNDOPTIONS" \ --erl "$FOREGROUNDOPTIONS" \
--erl "-mode $CODE_LOADING_MODE" \ --erl "-mode $CODE_LOADING_MODE" \
--erl "-mnesia dir \"${MNESIA_DATA_DIR}\"" \
--erl "$EPMD_ARGS" \ --erl "$EPMD_ARGS" \
--werl --werl
else else
@ -880,7 +879,6 @@ case "${COMMAND}" in
-boot_var RELEASE_LIB "$ERTS_LIB_DIR" \ -boot_var RELEASE_LIB "$ERTS_LIB_DIR" \
-boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \ -boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \
-mode "$CODE_LOADING_MODE" \ -mode "$CODE_LOADING_MODE" \
-mnesia dir "\"${MNESIA_DATA_DIR}\"" \
-config "$CONF_FILE" \ -config "$CONF_FILE" \
-args_file "$ARGS_FILE" \ -args_file "$ARGS_FILE" \
$EPMD_ARGS $EPMD_ARGS