diff options
| author | Matthew Wild <mwild1@gmail.com> | 2018-06-07 11:24:29 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2018-06-07 11:24:29 +0100 |
| commit | d31e7a5276ad29ad1390cd2ed344eeddb639a867 (patch) | |
| tree | 2ac15830c1ec94f100df281388f350cac4d0a50f | |
| parent | edc0a8a4eaf7ee368e74b9fd32167489f3df8963 (diff) | |
| parent | 0ff1619ea4e2a6702a3fb70135fb656efd64790b (diff) | |
| download | prosody-d31e7a5276ad29ad1390cd2ed344eeddb639a867.tar.gz prosody-d31e7a5276ad29ad1390cd2ed344eeddb639a867.zip | |
Merge 0.10->trunk
| -rw-r--r-- | util/startup.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/startup.lua b/util/startup.lua index 58f680d2..451a0587 100644 --- a/util/startup.lua +++ b/util/startup.lua @@ -374,7 +374,7 @@ end -- Override logging config (used by prosodyctl) function startup.force_console_logging() original_logging_config = config.get("*", "log"); - config.set("*", "log", { { levels = { min="info" }, to = "console" } }); + config.set("*", "log", { { levels = { min = os.getenv("PROSODYCTL_LOG_LEVEL") or "info" }, to = "console" } }); end function startup.switch_user() |