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

Merge pull request #4267 from zmstone/fix-config-use-config-file-default-value-for-log-to 

fix(config): use config value default log.to for daemon mode
This commit is contained in:
Zaiming Shi 2021-03-02 16:37:26 +01:00 committed by GitHub
parent fdc7f2a9ec 5d71e51985
commit 292358dc38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/emqx
View File

@ -20,8 +20,8 @@ mkdir -p "$RUNNER_LOG_DIR"
# Make sure data directory exists # Make sure data directory exists
mkdir -p "$RUNNER_DATA_DIR" mkdir -p "$RUNNER_DATA_DIR"
# cuttlefish try to read environment variables starting with "EMQX_", if not specified # cuttlefish try to read environment variables starting with "EMQX_"
export CUTTLEFISH_ENV_OVERRIDE_PREFIX="${CUTTLEFISH_ENV_OVERRIDE_PREFIX:-EMQX_}" export CUTTLEFISH_ENV_OVERRIDE_PREFIX='EMQX_'
relx_usage() { relx_usage() {
command="$1" command="$1"
@ -339,6 +339,10 @@ case "$1" in
# Bootstrap daemon command (check perms & drop to $RUNNER_USER) # Bootstrap daemon command (check perms & drop to $RUNNER_USER)
bootstrapd bootstrapd
# this flag passes down to console mode
# so we know it's intended to be run in daemon mode
export _EMQX_START_MODE="$1"
# Save this for later. # Save this for later.
CMD=$1 CMD=$1
case "$1" in case "$1" in
@ -519,7 +523,9 @@ case "$1" in
esac esac
# set before generate_config # set before generate_config
export EMQX_LOG__TO='console' if [ "${_EMQX_START_MODE:-}" = '' ]; then
export EMQX_LOG__TO="${EMQX_LOG__TO:-console}"
fi
#generate app.config and vm.args #generate app.config and vm.args
generate_config generate_config
@ -562,7 +568,7 @@ case "$1" in
# or other supervision services # or other supervision services
# set before generate_config # set before generate_config
export EMQX_LOG__TO='console' export EMQX_LOG__TO="${EMQX_LOG__TO:-console}"
#generate app.config and vm.args #generate app.config and vm.args
generate_config generate_config