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

feat(bin/emqx): make possible to boot Erlang node from Elixir build

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

3
bin/emqx
View File

@ -872,9 +872,12 @@ case "${COMMAND}" in
--erl "$EPMD_ARGS" \ --erl "$EPMD_ARGS" \
--werl --werl
else else
# pass down RELEASE_LIB so we can switch to IS_ELIXIR=no
# to boot an Erlang node from the elixir release
set -- "$BINDIR/erlexec" \ set -- "$BINDIR/erlexec" \
$FOREGROUNDOPTIONS \ $FOREGROUNDOPTIONS \
-boot "$BOOTFILE" \ -boot "$BOOTFILE" \
-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}\"" \ -mnesia dir "\"${MNESIA_DATA_DIR}\"" \

2
rel/emqx_vars
View File

@ -11,7 +11,7 @@ RUNNER_LOG_DIR="{{ runner_log_dir }}"
RUNNER_LIB_DIR="{{ runner_lib_dir }}" RUNNER_LIB_DIR="{{ runner_lib_dir }}"
EMQX_ETC_DIR="{{ emqx_etc_dir }}" EMQX_ETC_DIR="{{ emqx_etc_dir }}"
RUNNER_USER="{{ runner_user }}" RUNNER_USER="{{ runner_user }}"
IS_ELIXIR="{{ is_elixir }}" IS_ELIXIR="${IS_ELIXIR:-{{ is_elixir }}}"
SCHEMA_MOD="{{ emqx_schema_mod }}" SCHEMA_MOD="{{ emqx_schema_mod }}"
IS_ENTERPRISE="{{ is_enterprise }}" IS_ENTERPRISE="{{ is_enterprise }}"