mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 05:07:42 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.startup: Teach prosodyctl to be --quiet as complement to --verbose

Browse source 
Original motivation was tiresome warnings about Lua 5.4 not being
supported yet.

Can still be handy to tweak log level, e.g. to prevent logging to
interfere with command output.
This commit is contained in:
Kim Alvefur 2021-11-28 23:07:35 +01:00
parent 7f2e4b6313
commit 14f31180b5
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
man/prosodyctl.man
View file

@ -1,6 +1,6 @@
.\" Automatically generated by Pandoc 2.17.0.1
.\"
.TH "PROSODYCTL" "1" "2017-09-02" "" ""
.TH "PROSODYCTL" "1" "2022-02-02" "" ""
.hy
.SH NAME
.PP
@ -135,6 +135,12 @@ Don\[cq]t drop root privileges.
.TP
\f[B]\f[CB]--help\f[B]\f[R]
Display help text for the specified command.
.TP
\f[B]\f[CB]--verbose\f[B]\f[R]
Increase log level to show debug messages.
.TP
\f[B]\f[CB]--quiet\f[B]\f[R]
Reduce log level to only show errors.
.SH FILES
.TP
\f[B]\f[CB]/etc/prosody/prosody.cfg.lua\f[B]\f[R]

8
man/prosodyctl.markdown
View file

@ -2,7 +2,7 @@
author:
- Dwayne Bent <dbb.1@liqd.org>
- Kim Alvefur
date: 2017-09-02
date: 2022-02-02
section: 1
title: PROSODYCTL
---
@ -137,6 +137,12 @@ details of how these commands work you should see ejabberdctl(8).
`--help`
: Display help text for the specified command.
`--verbose`
: Increase log level to show debug messages.
`--quiet`
: Reduce log level to only show errors.
# FILES
`/etc/prosody/prosody.cfg.lua`

8
util/startup.lua
View file

@ -470,7 +470,13 @@ end
function startup.force_console_logging()
original_logging_config = config.get("*", "log");
local log_level = os.getenv("PROSODYCTL_LOG_LEVEL");
if not log_level and prosody.opts.verbose then log_level = "debug"; end
if not log_level then
if prosody.opts.verbose then
log_level = "debug";
elseif prosody.opts.quiet then
log_level = "error";
end
end
config.set("*", "log", { { levels = { min = log_level or "info" }, to = "console" } });
end