mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: log: add log profile buildlines

Browse Source 
Now that we have log-profile parsing done, let's prepare for runtime
log-profile handling by adding the necessary string buffer required to
re-build log strings using sess_build_logline() on the fly without
altering regular loglines content.

Indeed, since a different log-profile may (or may not) be specified for
each logger, we must keep the original string and only rebuild a custom
one when required for the current logger (according to the selected log-
profile).
This commit is contained in:
Aurelien DARRAGON 2024-01-31 18:25:09 +01:00
parent 15e9c7da6b
commit 48d34b98e4
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/log.c
View File

@ -339,11 +339,22 @@ unsigned int dropped_logs = 0;
*/ */
THREAD_LOCAL char *logline = NULL; THREAD_LOCAL char *logline = NULL;
/* Same as logline, but to build profile-specific log message
* (when log profiles are used)
*/
THREAD_LOCAL char *logline_lpf = NULL;
/* A global syslog message buffer, common to all RFC5424 syslog messages. /* A global syslog message buffer, common to all RFC5424 syslog messages.
* Currently, it is used for generating the structured-data part. * Currently, it is used for generating the structured-data part.
*/ */
THREAD_LOCAL char *logline_rfc5424 = NULL; THREAD_LOCAL char *logline_rfc5424 = NULL;
/* Same as logline_rfc5424, but to build profile-specific log message
* (when log profiles are used)
*/
THREAD_LOCAL char *logline_rfc5424_lpf = NULL;
struct logformat_node_args { struct logformat_node_args {
char *name; char *name;
int mask; int mask;
@ -3517,6 +3528,12 @@ int init_log_buffers()
logline_rfc5424 = my_realloc2(logline_rfc5424, global.max_syslog_len + 1); logline_rfc5424 = my_realloc2(logline_rfc5424, global.max_syslog_len + 1);
if (!logline || !logline_rfc5424) if (!logline || !logline_rfc5424)
return 0; return 0;
if (!LIST_ISEMPTY(&log_profile_list)) {
logline_lpf = my_realloc2(logline_lpf, global.max_syslog_len + 1);
logline_rfc5424_lpf = my_realloc2(logline_rfc5424_lpf, global.max_syslog_len + 1);
if (!logline_lpf || !logline_rfc5424_lpf)
return 0;
}
return 1; return 1;
} }
@ -3524,9 +3541,13 @@ int init_log_buffers()
void deinit_log_buffers() void deinit_log_buffers()
{ {
free(logline); free(logline);
free(logline_lpf);
free(logline_rfc5424); free(logline_rfc5424);
free(logline_rfc5424_lpf);
logline = NULL; logline = NULL;
logline_lpf = NULL;
logline_rfc5424 = NULL; logline_rfc5424 = NULL;
logline_rfc5424_lpf = NULL;
} }
/* Deinitialize log forwarder proxies used for syslog messages */ /* Deinitialize log forwarder proxies used for syslog messages */