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: provide proxy context to resolve_logger()

Browse Source 
Prerequisite work for log-profiles, we need to know under which proxy
context the logger is being used. When the info is not available, (ie:
global section or log-forward section, <px> is set to NULL)
This commit is contained in:
Aurelien DARRAGON 2024-05-14 17:05:30 +02:00
parent 42139fa16e
commit 3102c89dde
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/log.h
View File

@ -129,7 +129,7 @@ ssize_t syslog_applet_append_event(void *ctx, struct ist v1, struct ist v2, size
*/ */
int parse_logformat_string(const char *str, struct proxy *curproxy, struct lf_expr *lf_expr, int options, int cap, char **err); int parse_logformat_string(const char *str, struct proxy *curproxy, struct lf_expr *lf_expr, int options, int cap, char **err);
int postresolve_logger_list(struct list *loggers, const char *section, const char *section_name); int postresolve_logger_list(struct proxy *px, struct list *loggers, const char *section, const char *section_name);
struct logger *dup_logger(struct logger *def); struct logger *dup_logger(struct logger *def);
void free_logger(struct logger *logger); void free_logger(struct logger *logger);

2
src/fcgi-app.c
View File

@ -691,7 +691,7 @@ static int cfg_fcgi_apps_postparser()
curapp->maxreqs = 1; curapp->maxreqs = 1;
} }
err_code |= postresolve_logger_list(&curapp->loggers, "fcgi-app", curapp->name); err_code |= postresolve_logger_list(NULL, &curapp->loggers, "fcgi-app", curapp->name);
} }
end: end:

2
src/flt_spoe.c
View File

@ -3110,7 +3110,7 @@ spoe_check(struct proxy *px, struct flt_conf *fconf)
HA_SPIN_INIT(&conf->agent->rt[i].lock); HA_SPIN_INIT(&conf->agent->rt[i].lock);
} }
if (postresolve_logger_list(&conf->agent_fe.loggers, "SPOE agent", conf->agent->id) & ERR_CODE) if (postresolve_logger_list(NULL, &conf->agent_fe.loggers, "SPOE agent", conf->agent->id) & ERR_CODE)
return 1; return 1;
ha_free(&conf->agent->b.name); ha_free(&conf->agent->b.name);

15
src/log.c
View File

@ -1406,13 +1406,15 @@ static int postcheck_log_backend(struct proxy *be)
/* resolves a single logger entry (it is expected to be called /* resolves a single logger entry (it is expected to be called
* at postparsing stage) * at postparsing stage)
* *
* <px> is parent proxy, used for context (may be NULL)
*
* Returns err_code which defaults to ERR_NONE and can be set to a combination * Returns err_code which defaults to ERR_NONE and can be set to a combination
* of ERR_WARN, ERR_ALERT, ERR_FATAL and ERR_ABORT in case of errors. * of ERR_WARN, ERR_ALERT, ERR_FATAL and ERR_ABORT in case of errors.
* <msg> could be set at any time (it will usually be set on error, but * <msg> could be set at any time (it will usually be set on error, but
* could also be set when no error occurred to report a diag warning), thus is * could also be set when no error occurred to report a diag warning), thus is
* up to the caller to check it and to free it. * up to the caller to check it and to free it.
*/ */
static int resolve_logger(struct logger *logger, char **msg) static int resolve_logger(struct proxy *px, struct logger *logger, char **msg)
{ {
struct log_target *target = &logger->target; struct log_target *target = &logger->target;
int err_code = ERR_NONE; int err_code = ERR_NONE;
@ -5882,7 +5884,8 @@ int cfg_parse_log_forward(const char *file, int linenum, char **args, int kwm)
* Returns err_code which defaults to ERR_NONE and can be set to a combination * Returns err_code which defaults to ERR_NONE and can be set to a combination
* of ERR_WARN, ERR_ALERT, ERR_FATAL and ERR_ABORT in case of errors. * of ERR_WARN, ERR_ALERT, ERR_FATAL and ERR_ABORT in case of errors.
*/ */
int postresolve_logger_list(struct list *loggers, const char *section, const char *section_name) int postresolve_logger_list(struct proxy *px, struct list *loggers,
const char *section, const char *section_name)
{ {
int err_code = ERR_NONE; int err_code = ERR_NONE;
struct logger *logger; struct logger *logger;
@ -5891,7 +5894,7 @@ int postresolve_logger_list(struct list *loggers, const char *section, const cha
int cur_code; int cur_code;
char *msg = NULL; char *msg = NULL;
cur_code = resolve_logger(logger, &msg); cur_code = resolve_logger(px, logger, &msg);
if (msg) { if (msg) {
void (*e_func)(const char *fmt, ...) = NULL; void (*e_func)(const char *fmt, ...) = NULL;
@ -5923,13 +5926,13 @@ static int postresolve_loggers()
int err_code = ERR_NONE; int err_code = ERR_NONE;
/* global log directives */ /* global log directives */
err_code |= postresolve_logger_list(&global.loggers, NULL, NULL); err_code |= postresolve_logger_list(NULL, &global.loggers, NULL, NULL);
/* proxy log directives */ /* proxy log directives */
for (px = proxies_list; px; px = px->next) for (px = proxies_list; px; px = px->next)
err_code |= postresolve_logger_list(&px->loggers, "proxy", px->id); err_code |= postresolve_logger_list(px, &px->loggers, "proxy", px->id);
/* log-forward log directives */ /* log-forward log directives */
for (px = cfg_log_forward; px; px = px->next) for (px = cfg_log_forward; px; px = px->next)
err_code |= postresolve_logger_list(&px->loggers, "log-forward", px->id); err_code |= postresolve_logger_list(NULL, &px->loggers, "log-forward", px->id);
return err_code; return err_code;
} }