Преглед изворни кода

fix(config): use config value default log.to for daemon mode

Zaiming Shi пре 4 година
родитељ
комит
fc03d7aea9
1 измењених фајлова са 8 додато и 2 уклоњено
  1. 8 2
      bin/emqx

+ 8 - 2
bin/emqx

@@ -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