Software / code / prosody
Diff
util/startup.lua @ 8882:a420b386a72a
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 07 Jun 2018 11:24:29 +0100 |
| parent | 8756:2db9c9e3adc1 |
| child | 8958:b10a37f6f75f |
line wrap: on
line diff
--- a/util/startup.lua Wed Jun 06 15:26:16 2018 +0200 +++ b/util/startup.lua Thu Jun 07 11:24:29 2018 +0100 @@ -374,7 +374,7 @@ -- 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()
