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

fix: can't get emqx's priv_dir when whitespace in install path

This commit is contained in:
Zhongwen Deng 2022-05-05 15:59:14 +08:00
parent 8ff552c9cf
commit 41268dba01
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx/etc/emqx_cloud/vm.args
View File

@ -120,7 +120,7 @@
-shutdown_time 30000 -shutdown_time 30000
## patches dir ## patches dir
-pa {{ platform_data_dir }}/patches -pa "{{ platform_data_dir }}/patches"
## Mnesia thresholds ## Mnesia thresholds
-mnesia dump_log_write_threshold 5000 -mnesia dump_log_write_threshold 5000

2
apps/emqx/etc/emqx_edge/vm.args
View File

@ -118,7 +118,7 @@
-shutdown_time 10000 -shutdown_time 10000
## patches dir ## patches dir
-pa {{ platform_data_dir }}/patches -pa "{{ platform_data_dir }}/patches"
## Mnesia thresholds ## Mnesia thresholds
-mnesia dump_log_write_threshold 5000 -mnesia dump_log_write_threshold 5000

4
bin/emqx
View File

@ -289,7 +289,7 @@ compatiblity_info() {
-eval "$COMPATIBILITY_CHECK" -eval "$COMPATIBILITY_CHECK"
} }
# Collect Eralng/OTP runtime sanity and compatibility in one go # Collect Erlang/OTP runtime sanity and compatibility in one go
if [ "$IS_BOOT_COMMAND" = 'yes' ]; then if [ "$IS_BOOT_COMMAND" = 'yes' ]; then
# Read BUILD_INFO early as the next commands may mess up the shell # Read BUILD_INFO early as the next commands may mess up the shell
BUILD_INFO="$(cat "${REL_DIR}/BUILD_INFO")" BUILD_INFO="$(cat "${REL_DIR}/BUILD_INFO")"
@ -514,7 +514,7 @@ generate_config() {
TMP_ARG_FILE="$CONFIGS_DIR/vm.args.tmp" TMP_ARG_FILE="$CONFIGS_DIR/vm.args.tmp"
cp "$EMQX_ETC_DIR/vm.args" "$TMP_ARG_FILE" cp "$EMQX_ETC_DIR/vm.args" "$TMP_ARG_FILE"
echo "" >> "$TMP_ARG_FILE" echo "" >> "$TMP_ARG_FILE"
echo "-pa ${REL_DIR}/consolidated" >> "$TMP_ARG_FILE" echo "-pa \"${REL_DIR}/consolidated\"" >> "$TMP_ARG_FILE"
## read lines from generated vm.<time>.args file ## read lines from generated vm.<time>.args file
## drop comment lines, and empty lines using sed ## drop comment lines, and empty lines using sed
## pipe the lines to a while loop ## pipe the lines to a while loop