aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-06-07 11:24:29 +0100
committerMatthew Wild <mwild1@gmail.com>2018-06-07 11:24:29 +0100
commitad149e788d750baf48dbfb8dbbaa4e7e831ddba7 (patch)
tree2ac15830c1ec94f100df281388f350cac4d0a50f
parentca514bcbf6c9784279f8f6f4ae616fa7b309cb83 (diff)
parent29ebeb2da4fb62c8bfb3fe278e7908c07204be78 (diff)
downloadprosody-ad149e788d750baf48dbfb8dbbaa4e7e831ddba7.tar.gz
prosody-ad149e788d750baf48dbfb8dbbaa4e7e831ddba7.zip
Merge 0.10->trunk
-rw-r--r--util/startup.lua2
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()