Software / code / prosody
Changeset
8882:a420b386a72a
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 07 Jun 2018 11:24:29 +0100 |
| parents | 8879:4dee8c439afc (current diff) 8881:a0de4fc4acd5 (diff) |
| children | 8883:3f975bbfec3b |
| files | prosodyctl util/startup.lua |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Jun 06 15:26:16 2018 +0200 +++ b/.hgtags Thu Jun 07 11:24:29 2018 +0100 @@ -64,3 +64,4 @@ 082d127286451eb55420c36424dd321e8d9bceee 0.9.13 4ae8dd415e9431924ad4aa0b57bcee8a4a9272f8 0.10.1 29c6d2681bad9f67d8bd548bb3a7973473bae91e 0.9.14 +7ec098b68042f60687f1002e788b34b06048945d 0.10.2
--- 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()
