RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-01 22:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: lua: change tune.lua.log.stderr default from 'on' to 'auto'

Browse Source 
After making it configurable in previous commit "MINOR: lua: Add flags
to configure logging behaviour", this patch changes the default value
of tune.lua.log.stderr from 'on' (unconditionally forward LUA logs to
stderr) to 'auto' (only forward LUA logs to stderr if logging via a
standard logger is disabled, or none is configured for the current context)

Since this is a change in behaviour, it shouldn't be backported
This commit is contained in:
Tristan 2023-10-23 13:35:40 +01:00 committed by Willy Tarreau
parent 97dacbbb86
commit 8da0e45382
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/configuration.txt
View File

@ -3212,7 +3212,7 @@ tune.lua.log.stderr { on | auto | off }
Please note that, when enabled, this logging is in addition to the logging
configured via tune.lua.log.loggers.
Defaults to 'on'.
Defaults to 'auto'.
tune.max-checks-per-thread <number>
Sets the number of active checks per thread above which a thread will

4
doc/lua-api/index.rst
View File

@ -267,7 +267,7 @@ Core class
**context**: body, init, task, action, sample-fetch, converter
This function sends a log. The log is sent, according with the HAProxy
configuration file, to the loggers relevant to the current context and
configuration file, to the loggers relevant to the current context and/or
to stderr if it is allowed.
The exact behaviour depends on tune.lua.log.loggers and tune.lua.log.stderr.
@ -2650,7 +2650,7 @@ TXN class
.. js:function:: TXN.log(TXN, loglevel, msg)
This function sends a log. The log is sent, according with the HAProxy
configuration file, to the loggers relevant to the current context and
configuration file, to the loggers relevant to the current context and/or
to stderr if it is allowed.
The exact behaviour depends on tune.lua.log.loggers and tune.lua.log.stderr.

5
doc/lua.txt
View File

@ -631,8 +631,9 @@ It displays a log during the HAProxy startup:
[alert] 285/083533 (14465) : Hello World !
Note: By default, logs originating from a LUA script are sent to the loggers
applicable to the current context, if any, and additionally to stderr. See
tune.lua.log.loggers and tune.lua.log.stderr for more information.
applicable to the current context, if any. If none are configured for use,
logs are instead sent to stderr. See tune.lua.log.loggers and tune.lua.log.stderr
for more information.
Default path and libraries
--------------------------

6
src/hlua.c
View File

@ -81,7 +81,7 @@ enum hlua_log_opt {
HLUA_LOG_STDERR_MASK = 0x00000030,
};
/* default log options, made of flags in hlua_log_opt */
static uint hlua_log_opts = HLUA_LOG_LOGGERS_ON | HLUA_LOG_STDERR_ON;
static uint hlua_log_opts = HLUA_LOG_LOGGERS_ON | HLUA_LOG_STDERR_AUTO;
/* Lua uses longjmp to perform yield or throwing errors. This
* macro is used only for identifying the function that can
@ -1381,8 +1381,8 @@ const char *hlua_show_current_location(const char *pfx)
}
/* This function is used to send logs. It tries to send them to:
* - the log target applicable in the current context, AND
* - stderr if not in quiet mode or explicitly disabled
* - the log target applicable in the current context, OR
* - stderr when no logger is in use for the current context
*/
static inline void hlua_sendlog(struct proxy *px, int level, const char *msg)
{