diff --git a/addons/ot/src/conf.c b/addons/ot/src/conf.c index 2f667a42c..c6375a6b3 100644 --- a/addons/ot/src/conf.c +++ b/addons/ot/src/conf.c @@ -657,7 +657,7 @@ struct flt_ot_conf_tracer *flt_ot_conf_tracer_init(const char *id, int linenum, void flt_ot_conf_tracer_free(struct flt_ot_conf_tracer **ptr) { struct acl *acl, *aclback; - struct logsrv *logsrv, *logsrvback; + struct logger *logger, *loggerback; FLT_OT_FUNC("%p:%p", FLT_OT_DPTR_ARGS(ptr)); @@ -676,10 +676,10 @@ void flt_ot_conf_tracer_free(struct flt_ot_conf_tracer **ptr) FLT_OT_LIST_DEL(&(acl->list)); FLT_OT_FREE(acl); } - FLT_OT_DBG(2, "- deleting proxy_log.logsrvs list %s", flt_ot_list_debug(&((*ptr)->proxy_log.logsrvs))); - list_for_each_entry_safe(logsrv, logsrvback, &((*ptr)->proxy_log.logsrvs), list) { - LIST_DELETE(&(logsrv->list)); - FLT_OT_FREE(logsrv); + FLT_OT_DBG(2, "- deleting proxy_log.loggers list %s", flt_ot_list_debug(&((*ptr)->proxy_log.loggers))); + list_for_each_entry_safe(logger, loggerback, &((*ptr)->proxy_log.loggers), list) { + LIST_DELETE(&(logger->list)); + FLT_OT_FREE(logger); } FLT_OT_LIST_DESTROY(ph_group, &((*ptr)->ph_groups)); FLT_OT_LIST_DESTROY(ph_scope, &((*ptr)->ph_scopes)); diff --git a/addons/ot/src/parser.c b/addons/ot/src/parser.c index 3607e48c9..f4f3e04a7 100644 --- a/addons/ot/src/parser.c +++ b/addons/ot/src/parser.c @@ -489,7 +489,7 @@ static int flt_ot_parse_cfg_tracer(const char *file, int linenum, char **args, i } } else if (pdata->keyword == FLT_OT_PARSE_TRACER_LOG) { - if (parse_logsrv(args, &(flt_ot_current_tracer->proxy_log.logsrvs), kw_mod == KWM_NO, file, linenum, &err_log) == 0) { + if (parse_logger(args, &(flt_ot_current_tracer->proxy_log.loggers), kw_mod == KWM_NO, file, linenum, &err_log) == 0) { FLT_OT_PARSE_ERR(&err, "'%s %s ...' : %s", args[0], args[1], err_log); FLT_OT_FREE_CLEAR(err_log); diff --git a/include/haproxy/fcgi-app-t.h b/include/haproxy/fcgi-app-t.h index 542d586e8..fb6ab2740 100644 --- a/include/haproxy/fcgi-app-t.h +++ b/include/haproxy/fcgi-app-t.h @@ -84,7 +84,7 @@ struct fcgi_app { struct ist index; /* filename to append to URI ending by a '/' */ struct my_regex *pathinfo_re; /* Regex to use to split scriptname and path-info */ unsigned int flags; /* FCGI_APP_FL_* */ - struct list logsrvs; /* log servers */ + struct list loggers; /* one per 'log' directive */ unsigned int maxreqs; /* maximum number of concurrent requests */ struct list acls; /* list of acls declared for this application */ diff --git a/include/haproxy/global-t.h b/include/haproxy/global-t.h index e9c0f2d9f..1aca09b2f 100644 --- a/include/haproxy/global-t.h +++ b/include/haproxy/global-t.h @@ -137,7 +137,7 @@ struct global { int localpeer_cmdline; /* whether or not the commandline "-L" was set */ int fd_hard_limit; /* hard limit on ulimit-n : 0=unset */ struct buffer log_tag; /* name for syslog */ - struct list logsrvs; + struct list loggers; /* one per 'log' directive */ char *log_send_hostname; /* set hostname in syslog header */ char *server_state_base; /* path to a directory where server state files can be found */ char *server_state_file; /* path to the file where server states are loaded from */ diff --git a/include/haproxy/log-t.h b/include/haproxy/log-t.h index 467d31ca5..80b6f7dc7 100644 --- a/include/haproxy/log-t.h +++ b/include/haproxy/log-t.h @@ -218,7 +218,7 @@ struct smp_info { ullong curr_rg_idx; /* 63:32 = current range; 31:0 = current index */ }; -struct logsrv { +struct logger { struct list list; struct sockaddr_storage addr; struct smp_info lb; @@ -230,10 +230,10 @@ struct logsrv { int level; int minlvl; int maxlen; - struct logsrv *ref; + struct logger *ref; struct { - char *file; /* file where the logsrv appears */ - int line; /* line where the logsrv appears */ + char *file; /* file where the logger appears */ + int line; /* line where the logger appears */ } conf; }; diff --git a/include/haproxy/log.h b/include/haproxy/log.h index 16cc67150..d34f482b6 100644 --- a/include/haproxy/log.h +++ b/include/haproxy/log.h @@ -71,8 +71,8 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t void strm_log(struct stream *s); void sess_log(struct session *sess); -/* send a applicative log with custom list of log servers */ -void app_log(struct list *logsrvs, struct buffer *tag, int level, const char *format, ...) +/* send a applicative log with custom list of loggers */ +void app_log(struct list *loggers, struct buffer *tag, int level, const char *format, ...) __attribute__ ((format(printf, 4, 5))); /* @@ -87,13 +87,13 @@ int add_to_logformat_list(char *start, char *end, int type, struct list *list_fo */ int parse_logformat_string(const char *str, struct proxy *curproxy, struct list *list_format, int options, int cap, char **err); -int postresolve_logsrv_list(struct list *logsrvs, const char *section, const char *section_name); +int postresolve_logger_list(struct list *loggers, const char *section, const char *section_name); -struct logsrv *dup_logsrv(struct logsrv *def); -void free_logsrv(struct logsrv *logsrv); +struct logger *dup_logger(struct logger *def); +void free_logger(struct logger *logger); /* Parse "log" keyword and update the linked list. */ -int parse_logsrv(char **args, struct list *logsrvs, int do_del, const char *file, int linenum, char **err); +int parse_logger(char **args, struct list *loggers, int do_del, const char *file, int linenum, char **err); /* * This function adds a header to the message and sends the syslog message @@ -103,13 +103,13 @@ void send_log(struct proxy *p, int level, const char *format, ...) __attribute__ ((format(printf, 3, 4))); /* - * This function sends a syslog message to both log servers of a proxy, - * or to global log servers if the proxy is NULL. + * This function sends a syslog message to all loggers of a proxy, + * or to global loggers if the proxy is NULL. * It also tries not to waste too much time computing the message header. * It doesn't care about errors nor does it report them. */ -void __send_log(struct list *logsrvs, struct buffer *tag, int level, char *message, size_t size, char *sd, size_t sd_size); +void __send_log(struct list *loggers, struct buffer *tag, int level, char *message, size_t size, char *sd, size_t sd_size); /* * returns log format for or LOG_FORMAT_UNSPEC if not found. diff --git a/include/haproxy/proxy-t.h b/include/haproxy/proxy-t.h index cee87f5a0..e8cb7a5ee 100644 --- a/include/haproxy/proxy-t.h +++ b/include/haproxy/proxy-t.h @@ -371,7 +371,7 @@ struct proxy { struct proxy *next; struct proxy *next_stkt_ref; /* Link to the list of proxies which refer to the same stick-table. */ - struct list logsrvs; + struct list loggers; /* one per 'log' directive */ struct list logformat; /* log_format linked list */ struct list logformat_sd; /* log_format linked list for the RFC5424 structured-data part */ struct list logformat_error; /* log_format linked list used in case of connection error on the frontend */ diff --git a/include/haproxy/sink.h b/include/haproxy/sink.h index 59d4b1caf..19f2df912 100644 --- a/include/haproxy/sink.h +++ b/include/haproxy/sink.h @@ -81,7 +81,7 @@ static inline ssize_t sink_write(struct sink *sink, size_t maxlen, return sent; } -int sink_resolve_logsrv_buffer(struct logsrv *logsrv, char **msg); +int sink_resolve_logger_buffer(struct logger *logger, char **msg); #endif /* _HAPROXY_SINK_H */ diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c index dce56e616..52dac8feb 100644 --- a/src/cfgparse-global.c +++ b/src/cfgparse-global.c @@ -963,7 +963,7 @@ int cfg_parse_global(const char *file, int linenum, char **args, int kwm) } } else if (strcmp(args[0], "log") == 0) { /* "no log" or "log ..." */ - if (!parse_logsrv(args, &global.logsrvs, (kwm == KWM_NO), file, linenum, &errmsg)) { + if (!parse_logger(args, &global.loggers, (kwm == KWM_NO), file, linenum, &errmsg)) { ha_alert("parsing [%s:%d] : %s : %s\n", file, linenum, args[0], errmsg); err_code |= ERR_ALERT | ERR_FATAL; goto out; diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c index bd71111b8..d0bdca61d 100644 --- a/src/cfgparse-listen.c +++ b/src/cfgparse-listen.c @@ -2798,7 +2798,7 @@ stats_error_parsing: } } else if (strcmp(args[0], "log") == 0) { /* "no log" or "log ..." */ - if (!parse_logsrv(args, &curproxy->logsrvs, (kwm == KWM_NO), file, linenum, &errmsg)) { + if (!parse_logger(args, &curproxy->loggers, (kwm == KWM_NO), file, linenum, &errmsg)) { ha_alert("parsing [%s:%d] : %s : %s\n", file, linenum, args[0], errmsg); err_code |= ERR_ALERT | ERR_FATAL; goto out; diff --git a/src/cfgparse.c b/src/cfgparse.c index 42ff8a802..ce3104d99 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -748,7 +748,7 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm) err_code |= ERR_ALERT | ERR_ABORT; goto out; } - if (!parse_logsrv(args, &curpeers->peers_fe->logsrvs, (kwm == KWM_NO), file, linenum, &errmsg)) { + if (!parse_logger(args, &curpeers->peers_fe->loggers, (kwm == KWM_NO), file, linenum, &errmsg)) { ha_alert("parsing [%s:%d] : %s : %s\n", file, linenum, args[0], errmsg); err_code |= ERR_ALERT | ERR_FATAL; goto out; @@ -2772,7 +2772,7 @@ init_proxies_list_stage1: struct switching_rule *rule; struct server_rule *srule; struct sticking_rule *mrule; - struct logsrv *tmplogsrv; + struct logger *tmplogger; unsigned int next_id; if (!(curproxy->cap & PR_CAP_INT) && curproxy->uuid < 0) { @@ -3404,9 +3404,9 @@ init_proxies_list_stage1: } out_uri_auth_compat: - /* check whether we have a log server that uses RFC5424 log format */ - list_for_each_entry(tmplogsrv, &curproxy->logsrvs, list) { - if (tmplogsrv->format == LOG_FORMAT_RFC5424) { + /* check whether we have a logger that uses RFC5424 log format */ + list_for_each_entry(tmplogger, &curproxy->loggers, list) { + if (tmplogger->format == LOG_FORMAT_RFC5424) { if (!curproxy->conf.logformat_sd_string) { /* set the default logformat_sd_string */ curproxy->conf.logformat_sd_string = default_rfc5424_sd_log_format; @@ -3789,7 +3789,7 @@ out_uri_auth_compat: curproxy->to_log &= ~LW_BYTES; if (!(curproxy->cap & PR_CAP_INT) && (curproxy->mode == PR_MODE_TCP || curproxy->mode == PR_MODE_HTTP) && - (curproxy->cap & PR_CAP_FE) && LIST_ISEMPTY(&curproxy->logsrvs) && + (curproxy->cap & PR_CAP_FE) && LIST_ISEMPTY(&curproxy->loggers) && (!LIST_ISEMPTY(&curproxy->logformat) || !LIST_ISEMPTY(&curproxy->logformat_sd))) { ha_warning("log format ignored for %s '%s' since it has no log address.\n", proxy_type_str(curproxy), curproxy->id); diff --git a/src/fcgi-app.c b/src/fcgi-app.c index 148ab5e22..a182c764d 100644 --- a/src/fcgi-app.c +++ b/src/fcgi-app.c @@ -706,7 +706,7 @@ static int cfg_fcgi_apps_postparser() curapp->maxreqs = 1; } - err_code |= postresolve_logsrv_list(&curapp->logsrvs, "fcgi-app", curapp->name); + err_code |= postresolve_logger_list(&curapp->loggers, "fcgi-app", curapp->name); } end: @@ -810,7 +810,7 @@ static int cfg_parse_fcgi_app(const char *file, int linenum, char **args, int kw curapp->conf.file = strdup(file); curapp->conf.line = linenum; LIST_INIT(&curapp->acls); - LIST_INIT(&curapp->logsrvs); + LIST_INIT(&curapp->loggers); LIST_INIT(&curapp->conf.args.list); LIST_INIT(&curapp->conf.rules); @@ -1051,7 +1051,7 @@ static int cfg_parse_fcgi_app(const char *file, int linenum, char **args, int kw } } else if (strcmp(args[0], "log-stderr") == 0) { - if (!parse_logsrv(args, &curapp->logsrvs, (kwm == KWM_NO), file, linenum, &errmsg)) { + if (!parse_logger(args, &curapp->loggers, (kwm == KWM_NO), file, linenum, &errmsg)) { ha_alert("parsing [%s:%d] : %s : %s\n", file, linenum, args[0], errmsg); err_code |= ERR_ALERT | ERR_FATAL; } @@ -1073,7 +1073,7 @@ out: void fcgi_apps_deinit() { struct fcgi_app *curapp, *nextapp; - struct logsrv *log, *logb; + struct logger *log, *logb; for (curapp = fcgi_apps; curapp != NULL; curapp = nextapp) { struct fcgi_rule_conf *rule, *back; @@ -1084,7 +1084,7 @@ void fcgi_apps_deinit() regex_free(curapp->pathinfo_re); free(curapp->conf.file); - list_for_each_entry_safe(log, logb, &curapp->logsrvs, list) { + list_for_each_entry_safe(log, logb, &curapp->loggers, list) { LIST_DELETE(&log->list); free(log); } diff --git a/src/flt_spoe.c b/src/flt_spoe.c index f171f065c..e8f338349 100644 --- a/src/flt_spoe.c +++ b/src/flt_spoe.c @@ -88,7 +88,7 @@ struct list curgphs; struct list curvars; /* list of log servers used during the parsing */ -struct list curlogsrvs; +struct list curloggers; /* agent's proxy flags (PR_O_* and PR_O2_*) used during parsing */ int curpxopts; @@ -3119,7 +3119,7 @@ spoe_check(struct proxy *px, struct flt_conf *fconf) HA_SPIN_INIT(&conf->agent->rt[i].lock); } - if (postresolve_logsrv_list(&conf->agent_fe.logsrvs, "SPOE agent", conf->agent->id) & ERR_CODE) + if (postresolve_logger_list(&conf->agent_fe.loggers, "SPOE agent", conf->agent->id) & ERR_CODE) return 1; ha_free(&conf->agent->b.name); @@ -3786,7 +3786,7 @@ cfg_parse_spoe_agent(const char *file, int linenum, char **args, int kwm) else if (strcmp(args[0], "log") == 0) { char *errmsg = NULL; - if (!parse_logsrv(args, &curlogsrvs, (kwm == 1), file, linenum, &errmsg)) { + if (!parse_logger(args, &curloggers, (kwm == 1), file, linenum, &errmsg)) { ha_alert("parsing [%s:%d] : %s : %s\n", file, linenum, args[0], errmsg); err_code |= ERR_ALERT | ERR_FATAL; goto out; @@ -4096,7 +4096,7 @@ parse_spoe_flt(char **args, int *cur_arg, struct proxy *px, struct spoe_group *grp, *grpback; struct spoe_placeholder *ph, *phback; struct spoe_var_placeholder *vph, *vphback; - struct logsrv *logsrv, *logsrvback; + struct logger *logger, *loggerback; char *file = NULL, *engine = NULL; int ret, pos = *cur_arg + 1; @@ -4105,7 +4105,7 @@ parse_spoe_flt(char **args, int *cur_arg, struct proxy *px, LIST_INIT(&curmphs); LIST_INIT(&curgphs); LIST_INIT(&curvars); - LIST_INIT(&curlogsrvs); + LIST_INIT(&curloggers); curpxopts = 0; curpxopts2 = 0; @@ -4435,9 +4435,9 @@ parse_spoe_flt(char **args, int *cur_arg, struct proxy *px, conf->agent_fe.options |= curpxopts; conf->agent_fe.options2 |= curpxopts2; - list_for_each_entry_safe(logsrv, logsrvback, &curlogsrvs, list) { - LIST_DELETE(&logsrv->list); - LIST_APPEND(&conf->agent_fe.logsrvs, &logsrv->list); + list_for_each_entry_safe(logger, loggerback, &curloggers, list) { + LIST_DELETE(&logger->list); + LIST_APPEND(&conf->agent_fe.loggers, &logger->list); } list_for_each_entry_safe(ph, phback, &curmphs, list) { @@ -4501,9 +4501,9 @@ parse_spoe_flt(char **args, int *cur_arg, struct proxy *px, LIST_DELETE(&msg->list); spoe_release_message(msg); } - list_for_each_entry_safe(logsrv, logsrvback, &curlogsrvs, list) { - LIST_DELETE(&logsrv->list); - free(logsrv); + list_for_each_entry_safe(logger, loggerback, &curloggers, list) { + LIST_DELETE(&logger->list); + free(logger); } free(conf); return -1; diff --git a/src/frontend.c b/src/frontend.c index 0c2fb9cd0..105b24bcc 100644 --- a/src/frontend.c +++ b/src/frontend.c @@ -54,7 +54,7 @@ int frontend_accept(struct stream *s) struct proxy *fe = sess->fe; if ((fe->mode == PR_MODE_TCP || fe->mode == PR_MODE_HTTP) - && (!LIST_ISEMPTY(&fe->logsrvs))) { + && (!LIST_ISEMPTY(&fe->loggers))) { if (likely(!LIST_ISEMPTY(&fe->logformat))) { /* we have the client ip */ if (s->logs.logwait & LW_CLIP) diff --git a/src/haproxy.c b/src/haproxy.c index dc6bc8566..5b7d44fda 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -178,7 +178,7 @@ struct global global = { .numa_cpu_mapping = 1, .nbthread = 0, .req_count = 0, - .logsrvs = LIST_HEAD_INIT(global.logsrvs), + .loggers = LIST_HEAD_INIT(global.loggers), .maxzlibmem = DEFAULT_MAXZLIBMEM * 1024U * 1024U, .comp_rate_lim = 0, .ssl_server_verify = SSL_SERVER_VERIFY_REQUIRED, @@ -2735,7 +2735,7 @@ void deinit(void) struct proxy *p = proxies_list, *p0; struct wordlist *wl, *wlb; struct uri_auth *uap, *ua = NULL; - struct logsrv *log, *logb; + struct logger *log, *logb; struct build_opts_str *bol, *bolb; struct post_deinit_fct *pdf, *pdfb; struct proxy_deinit_fct *pxdf, *pxdfb; @@ -2864,9 +2864,9 @@ void deinit(void) task_destroy(idle_conn_task); idle_conn_task = NULL; - list_for_each_entry_safe(log, logb, &global.logsrvs, list) { + list_for_each_entry_safe(log, logb, &global.loggers, list) { LIST_DEL_INIT(&log->list); - free_logsrv(log); + free_logger(log); } list_for_each_entry_safe(wl, wlb, &cfg_cfgfiles, list) { diff --git a/src/http_client.c b/src/http_client.c index bebdd7f51..e8fdf42a1 100644 --- a/src/http_client.c +++ b/src/http_client.c @@ -1224,7 +1224,7 @@ struct proxy *httpclient_create_proxy(const char *id) px->conn_retries = httpclient_retries; px->timeout.connect = httpclient_timeout_connect; px->timeout.client = TICK_ETERNITY; - /* The HTTP Client use the "option httplog" with the global log server */ + /* The HTTP Client use the "option httplog" with the global loggers */ px->conf.logformat_string = httpclient_log_format; px->http_needed = 1; @@ -1354,7 +1354,7 @@ static int httpclient_precheck() static int httpclient_postcheck_proxy(struct proxy *curproxy) { int err_code = ERR_NONE; - struct logsrv *logsrv; + struct logger *logger; char *errmsg = NULL; #ifdef USE_OPENSSL struct server *srv = NULL; @@ -1368,15 +1368,15 @@ static int httpclient_postcheck_proxy(struct proxy *curproxy) return ERR_NONE; /* nothing to do */ /* copy logs from "global" log list */ - list_for_each_entry(logsrv, &global.logsrvs, list) { - struct logsrv *node = dup_logsrv(logsrv); + list_for_each_entry(logger, &global.loggers, list) { + struct logger *node = dup_logger(logger); if (!node) { memprintf(&errmsg, "out of memory."); err_code |= ERR_ALERT | ERR_FATAL; goto err; } - LIST_APPEND(&curproxy->logsrvs, &node->list); + LIST_APPEND(&curproxy->loggers, &node->list); } if (curproxy->conf.logformat_string) { curproxy->conf.args.ctx = ARGC_LOG; diff --git a/src/log.c b/src/log.c index b40ac1eda..1af0e6464 100644 --- a/src/log.c +++ b/src/log.c @@ -666,7 +666,7 @@ int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list * ranges of indexes. Note that an index may be considered as a particular range * with a high limit to the low limit. */ -int get_logsrv_smp_range(unsigned int *low, unsigned int *high, char **arg, char **err) +int get_logger_smp_range(unsigned int *low, unsigned int *high, char **arg, char **err) { char *end, *p; @@ -734,10 +734,10 @@ int smp_log_range_cmp(const void *a, const void *b) return 0; } -/* resolves a single logsrv entry (it is expected to be called +/* resolves a single logger entry (it is expected to be called * at postparsing stage) * - * is parent logsrv used for implicit settings + * is parent logger used for implicit settings * * 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. @@ -745,23 +745,23 @@ int smp_log_range_cmp(const void *a, const void *b) * could also be set when no error occured to report a diag warning), thus is * up to the caller to check it and to free it. */ -int resolve_logsrv(struct logsrv *logsrv, char **msg) +int resolve_logger(struct logger *logger, char **msg) { int err_code = ERR_NONE; - if (logsrv->type == LOG_TARGET_BUFFER) - err_code = sink_resolve_logsrv_buffer(logsrv, msg); + if (logger->type == LOG_TARGET_BUFFER) + err_code = sink_resolve_logger_buffer(logger, msg); return err_code; } -/* tries to duplicate logsrv +/* tries to duplicate logger * - * Returns the newly allocated and duplicated logsrv or NULL + * Returns the newly allocated and duplicated logger or NULL * in case of error. */ -struct logsrv *dup_logsrv(struct logsrv *def) +struct logger *dup_logger(struct logger *def) { - struct logsrv *cpy = malloc(sizeof(*cpy)); + struct logger *cpy = malloc(sizeof(*cpy)); /* copy everything that can be easily copied */ memcpy(cpy, def, sizeof(*cpy)); @@ -786,44 +786,44 @@ struct logsrv *dup_logsrv(struct logsrv *def) return cpy; error: - free_logsrv(cpy); + free_logger(cpy); return NULL; } -/* frees log server after freeing all of its allocated fields. The +/* frees after freeing all of its allocated fields. The * server must not belong to a list anymore. Logsrv may be NULL, which is * silently ignored. */ -void free_logsrv(struct logsrv *logsrv) +void free_logger(struct logger *logger) { - if (!logsrv) + if (!logger) return; - BUG_ON(LIST_INLIST(&logsrv->list)); - ha_free(&logsrv->conf.file); - ha_free(&logsrv->ring_name); - free(logsrv); + BUG_ON(LIST_INLIST(&logger->list)); + ha_free(&logger->conf.file); + ha_free(&logger->ring_name); + free(logger); } /* - * Parse "log" keyword and update list accordingly. + * Parse "log" keyword and update list accordingly. * * When is set, it means the "no log" line was parsed, so all log - * servers in are released. + * servers in are released. * * Otherwise, we try to parse the "log" line. First of all, when the list is not * the global one, we look for the parameter "global". If we find it, - * global.logsrvs is copied. Else we parse each arguments. + * global.loggers is copied. Else we parse each arguments. * * The function returns 1 in success case, otherwise, it returns 0 and err is * filled. */ -int parse_logsrv(char **args, struct list *logsrvs, int do_del, const char *file, int linenum, char **err) +int parse_logger(char **args, struct list *loggers, int do_del, const char *file, int linenum, char **err) { struct smp_log_range *smp_rgs = NULL; struct sockaddr_storage *sk; struct protocol *proto; - struct logsrv *logsrv = NULL; + struct logger *logger = NULL; int port1, port2; int cur_arg; int fd; @@ -833,39 +833,39 @@ int parse_logsrv(char **args, struct list *logsrvs, int do_del, const char *file * servers. */ if (do_del) { - struct logsrv *back; + struct logger *back; if (*(args[1]) != 0) { memprintf(err, "'no log' does not expect arguments"); goto error; } - list_for_each_entry_safe(logsrv, back, logsrvs, list) { - LIST_DEL_INIT(&logsrv->list); - free_logsrv(logsrv); + list_for_each_entry_safe(logger, back, loggers, list) { + LIST_DEL_INIT(&logger->list); + free_logger(logger); } return 1; } /* - * "log global": copy global.logrsvs linked list to the end of logsrvs - * list. But first, we check (logsrvs != global.logsrvs). + * "log global": copy global.loggers linked list to the end of loggers + * list. But first, we check (loggers != global.loggers). */ if (*(args[1]) && *(args[2]) == 0 && strcmp(args[1], "global") == 0) { - if (logsrvs == &global.logsrvs) { + if (loggers == &global.loggers) { memprintf(err, "'global' is not supported for a global syslog server"); goto error; } - list_for_each_entry(logsrv, &global.logsrvs, list) { - struct logsrv *node; + list_for_each_entry(logger, &global.loggers, list) { + struct logger *node; - list_for_each_entry(node, logsrvs, list) { - if (node->ref == logsrv) - goto skip_logsrv; + list_for_each_entry(node, loggers, list) { + if (node->ref == logger) + goto skip_logger; } - /* duplicate logsrv from global */ - node = dup_logsrv(logsrv); + /* duplicate logger from global */ + node = dup_logger(logger); if (!node) { memprintf(err, "out of memory error"); goto error; @@ -877,9 +877,9 @@ int parse_logsrv(char **args, struct list *logsrvs, int do_del, const char *file node->conf.line = linenum; /* add to list */ - LIST_APPEND(logsrvs, &node->list); + LIST_APPEND(loggers, &node->list); - skip_logsrv: + skip_logger: continue; } return 1; @@ -890,7 +890,7 @@ int parse_logsrv(char **args, struct list *logsrvs, int do_del, const char *file */ if (*(args[1]) == 0 || *(args[2]) == 0) { memprintf(err, "expects
and %s as arguments", - ((logsrvs == &global.logsrvs) ? "" : "or global")); + ((loggers == &global.loggers) ? "" : "or global")); goto error; } @@ -900,20 +900,20 @@ int parse_logsrv(char **args, struct list *logsrvs, int do_del, const char *file else if (strcmp(args[1], "stderr") == 0) args[1] = "fd@2"; - logsrv = calloc(1, sizeof(*logsrv)); - if (!logsrv) { + logger = calloc(1, sizeof(*logger)); + if (!logger) { memprintf(err, "out of memory"); goto error; } - LIST_INIT(&logsrv->list); - logsrv->conf.file = strdup(file); - logsrv->conf.line = linenum; + LIST_INIT(&logger->list); + logger->conf.file = strdup(file); + logger->conf.line = linenum; /* skip address for now, it will be parsed at the end */ cur_arg = 2; /* just after the address, a length may be specified */ - logsrv->maxlen = MAX_SYSLOG_LEN; + logger->maxlen = MAX_SYSLOG_LEN; if (strcmp(args[cur_arg], "len") == 0) { int len = atoi(args[cur_arg+1]); if (len < 80 || len > 65535) { @@ -921,16 +921,16 @@ int parse_logsrv(char **args, struct list *logsrvs, int do_del, const char *file args[cur_arg+1]); goto error; } - logsrv->maxlen = len; + logger->maxlen = len; cur_arg += 2; } - if (logsrv->maxlen > global.max_syslog_len) - global.max_syslog_len = logsrv->maxlen; + if (logger->maxlen > global.max_syslog_len) + global.max_syslog_len = logger->maxlen; /* after the length, a format may be specified */ if (strcmp(args[cur_arg], "format") == 0) { - logsrv->format = get_log_format(args[cur_arg+1]); - if (logsrv->format == LOG_FORMAT_UNSPEC) { + logger->format = get_log_format(args[cur_arg+1]); + if (logger->format == LOG_FORMAT_UNSPEC) { memprintf(err, "unknown log format '%s'", args[cur_arg+1]); goto error; } @@ -954,7 +954,7 @@ int parse_logsrv(char **args, struct list *logsrvs, int do_del, const char *file end = p + strlen(p); while (p != end) { - if (!get_logsrv_smp_range(&low, &high, &p, err)) + if (!get_logger_smp_range(&low, &high, &p, err)) goto error; if (smp_rgs && smp_log_ranges_overlap(smp_rgs, smp_rgs_sz, low, high, err)) @@ -999,26 +999,26 @@ int parse_logsrv(char **args, struct list *logsrvs, int do_del, const char *file /* Let's order array. */ qsort(smp_rgs, smp_rgs_sz, sizeof(struct smp_log_range), smp_log_range_cmp); - logsrv->lb.smp_rgs = smp_rgs; - logsrv->lb.smp_rgs_sz = smp_rgs_sz; - logsrv->lb.smp_sz = smp_sz; + logger->lb.smp_rgs = smp_rgs; + logger->lb.smp_rgs_sz = smp_rgs_sz; + logger->lb.smp_sz = smp_sz; cur_arg += 2; } /* parse the facility */ - logsrv->facility = get_log_facility(args[cur_arg]); - if (logsrv->facility < 0) { + logger->facility = get_log_facility(args[cur_arg]); + if (logger->facility < 0) { memprintf(err, "unknown log facility '%s'", args[cur_arg]); goto error; } cur_arg++; /* parse the max syslog level (default: debug) */ - logsrv->level = 7; + logger->level = 7; if (*(args[cur_arg])) { - logsrv->level = get_log_level(args[cur_arg]); - if (logsrv->level < 0) { + logger->level = get_log_level(args[cur_arg]); + if (logger->level < 0) { memprintf(err, "unknown optional log level '%s'", args[cur_arg]); goto error; } @@ -1026,10 +1026,10 @@ int parse_logsrv(char **args, struct list *logsrvs, int do_del, const char *file } /* parse the limit syslog level (default: emerg) */ - logsrv->minlvl = 0; + logger->minlvl = 0; if (*(args[cur_arg])) { - logsrv->minlvl = get_log_level(args[cur_arg]); - if (logsrv->minlvl < 0) { + logger->minlvl = get_log_level(args[cur_arg]); + if (logger->minlvl < 0) { memprintf(err, "unknown optional minimum log level '%s'", args[cur_arg]); goto error; } @@ -1043,12 +1043,12 @@ int parse_logsrv(char **args, struct list *logsrvs, int do_del, const char *file } /* now, back to the address */ - logsrv->type = LOG_TARGET_DGRAM; + logger->type = LOG_TARGET_DGRAM; if (strncmp(args[1], "ring@", 5) == 0) { - logsrv->addr.ss_family = AF_UNSPEC; - logsrv->type = LOG_TARGET_BUFFER; - logsrv->sink = NULL; - logsrv->ring_name = strdup(args[1] + 5); + logger->addr.ss_family = AF_UNSPEC; + logger->type = LOG_TARGET_BUFFER; + logger->sink = NULL; + logger->ring_name = strdup(args[1] + 5); goto done; } @@ -1059,12 +1059,12 @@ int parse_logsrv(char **args, struct list *logsrvs, int do_del, const char *file goto error; if (fd != -1) - logsrv->type = LOG_TARGET_FD; - logsrv->addr = *sk; + logger->type = LOG_TARGET_FD; + logger->addr = *sk; if (sk->ss_family == AF_INET || sk->ss_family == AF_INET6) { if (!port1) - set_host_port(&logsrv->addr, SYSLOG_PORT); + set_host_port(&logger->addr, SYSLOG_PORT); } if (proto && proto->xprt_type == PROTO_TYPE_STREAM) { @@ -1073,19 +1073,19 @@ int parse_logsrv(char **args, struct list *logsrvs, int do_del, const char *file /* Implicit sink buffer will be * initialized in post_check */ - logsrv->type = LOG_TARGET_BUFFER; - logsrv->sink = NULL; + logger->type = LOG_TARGET_BUFFER; + logger->sink = NULL; /* compute uniq name for the ring */ - memprintf(&logsrv->ring_name, "ring#%lu", ++ring_ids); + memprintf(&logger->ring_name, "ring#%lu", ++ring_ids); } done: - LIST_APPEND(logsrvs, &logsrv->list); + LIST_APPEND(loggers, &logger->list); return 1; error: free(smp_rgs); - free_logsrv(logsrv); + free_logger(logger); return 0; } @@ -1369,7 +1369,7 @@ void send_log(struct proxy *p, int level, const char *format, ...) data_len = global.max_syslog_len; va_end(argp); - __send_log((p ? &p->logsrvs : NULL), (p ? &p->log_tag : NULL), level, + __send_log((p ? &p->loggers : NULL), (p ? &p->log_tag : NULL), level, logline, data_len, default_rfc5424_sd_log_format, 2); } /* @@ -1676,13 +1676,13 @@ struct ist *build_log_header(enum log_fmt format, int level, int facility, } /* - * This function sends a syslog message to . + * This function sends a syslog message to . * The argument MUST be an array of size * LOG_META_FIELDS*sizeof(struct ist) containing data to build the header. * It overrides the last byte of the message vector with an LF character. * Does not return any error, */ -static inline void __do_send_log(struct logsrv *logsrv, int nblogger, int level, int facility, struct ist *metadata, char *message, size_t size) +static inline void __do_send_log(struct logger *logger, int nblogger, int level, int facility, struct ist *metadata, char *message, size_t size) { static THREAD_LOCAL struct iovec iovec[NB_LOG_HDR_MAX_ELEMENTS+1+1] = { }; /* header elements + message + LF */ static THREAD_LOCAL struct msghdr msghdr = { @@ -1704,23 +1704,23 @@ static inline void __do_send_log(struct logsrv *logsrv, int nblogger, int level, while (size && (message[size-1] == '\n' || (message[size-1] == 0))) size--; - if (logsrv->type == LOG_TARGET_BUFFER) { + if (logger->type == LOG_TARGET_BUFFER) { plogfd = NULL; goto send; } - else if (logsrv->addr.ss_family == AF_CUST_EXISTING_FD) { + else if (logger->addr.ss_family == AF_CUST_EXISTING_FD) { /* the socket's address is a file descriptor */ - plogfd = (int *)&((struct sockaddr_in *)&logsrv->addr)->sin_addr.s_addr; + plogfd = (int *)&((struct sockaddr_in *)&logger->addr)->sin_addr.s_addr; } - else if (logsrv->addr.ss_family == AF_UNIX) + else if (logger->addr.ss_family == AF_UNIX) plogfd = &logfdunix; else plogfd = &logfdinet; if (plogfd && unlikely(*plogfd < 0)) { /* socket not successfully initialized yet */ - if ((*plogfd = socket(logsrv->addr.ss_family, SOCK_DGRAM, - (logsrv->addr.ss_family == AF_UNIX) ? 0 : IPPROTO_UDP)) < 0) { + if ((*plogfd = socket(logger->addr.ss_family, SOCK_DGRAM, + (logger->addr.ss_family == AF_UNIX) ? 0 : IPPROTO_UDP)) < 0) { static char once; if (!once) { @@ -1738,11 +1738,11 @@ static inline void __do_send_log(struct logsrv *logsrv, int nblogger, int level, } } - msg_header = build_log_header(logsrv->format, level, facility, metadata, &nbelem); + msg_header = build_log_header(logger->format, level, facility, metadata, &nbelem); send: - if (logsrv->type == LOG_TARGET_BUFFER) { + if (logger->type == LOG_TARGET_BUFFER) { struct ist msg; - size_t maxlen = logsrv->maxlen; + size_t maxlen = logger->maxlen; msg = ist2(message, size); @@ -1751,18 +1751,18 @@ static inline void __do_send_log(struct logsrv *logsrv, int nblogger, int level, */ maxlen -= 1; - sent = sink_write(logsrv->sink, maxlen, &msg, 1, level, facility, metadata); + sent = sink_write(logger->sink, maxlen, &msg, 1, level, facility, metadata); } - else if (logsrv->addr.ss_family == AF_CUST_EXISTING_FD) { + else if (logger->addr.ss_family == AF_CUST_EXISTING_FD) { struct ist msg; msg = ist2(message, size); - sent = fd_write_frag_line(*plogfd, logsrv->maxlen, msg_header, nbelem, &msg, 1, 1); + sent = fd_write_frag_line(*plogfd, logger->maxlen, msg_header, nbelem, &msg, 1, 1); } else { int i = 0; - int totlen = logsrv->maxlen - 1; /* save space for the final '\n' */ + int totlen = logger->maxlen - 1; /* save space for the final '\n' */ for (i = 0 ; i < nbelem ; i++ ) { iovec[i].iov_base = msg_header[i].ptr; @@ -1786,8 +1786,8 @@ static inline void __do_send_log(struct logsrv *logsrv, int nblogger, int level, i++; msghdr.msg_iovlen = i; - msghdr.msg_name = (struct sockaddr *)&logsrv->addr; - msghdr.msg_namelen = get_addr_len(&logsrv->addr); + msghdr.msg_name = (struct sockaddr *)&logger->addr; + msghdr.msg_namelen = get_addr_len(&logger->addr); sent = sendmsg(*plogfd, &msghdr, MSG_DONTWAIT | MSG_NOSIGNAL); } @@ -1812,31 +1812,31 @@ static inline void __do_send_log(struct logsrv *logsrv, int nblogger, int level, * LOG_META_FIELDS*sizeof(struct ist) containing * data to build the header. */ -void process_send_log(struct list *logsrvs, int level, int facility, +void process_send_log(struct list *loggers, int level, int facility, struct ist *metadata, char *message, size_t size) { - struct logsrv *logsrv; + struct logger *logger; int nblogger; /* Send log messages to syslog server. */ nblogger = 0; - list_for_each_entry(logsrv, logsrvs, list) { + list_for_each_entry(logger, loggers, list) { int in_range = 1; /* we can filter the level of the messages that are sent to each logger */ - if (level > logsrv->level) + if (level > logger->level) continue; - if (logsrv->lb.smp_rgs) { + if (logger->lb.smp_rgs) { struct smp_log_range *smp_rg; uint next_idx, curr_rg; ullong curr_rg_idx, next_rg_idx; - curr_rg_idx = _HA_ATOMIC_LOAD(&logsrv->lb.curr_rg_idx); + curr_rg_idx = _HA_ATOMIC_LOAD(&logger->lb.curr_rg_idx); do { next_idx = (curr_rg_idx & 0xFFFFFFFFU) + 1; curr_rg = curr_rg_idx >> 32; - smp_rg = &logsrv->lb.smp_rgs[curr_rg]; + smp_rg = &logger->lb.smp_rgs[curr_rg]; /* check if the index we're going to take is within range */ in_range = smp_rg->low <= next_idx && next_idx <= smp_rg->high; @@ -1844,18 +1844,18 @@ void process_send_log(struct list *logsrvs, int level, int facility, /* Let's consume this range. */ if (next_idx == smp_rg->high) { /* If consumed, let's select the next range. */ - curr_rg = (curr_rg + 1) % logsrv->lb.smp_rgs_sz; + curr_rg = (curr_rg + 1) % logger->lb.smp_rgs_sz; } } - next_idx = next_idx % logsrv->lb.smp_sz; + next_idx = next_idx % logger->lb.smp_sz; next_rg_idx = ((ullong)curr_rg << 32) + next_idx; - } while (!_HA_ATOMIC_CAS(&logsrv->lb.curr_rg_idx, &curr_rg_idx, next_rg_idx) && + } while (!_HA_ATOMIC_CAS(&logger->lb.curr_rg_idx, &curr_rg_idx, next_rg_idx) && __ha_cpu_relax()); } if (in_range) - __do_send_log(logsrv, ++nblogger, MAX(level, logsrv->minlvl), - (facility == -1) ? logsrv->facility : facility, + __do_send_log(logger, ++nblogger, MAX(level, logger->minlvl), + (facility == -1) ? logger->facility : facility, metadata, message, size); } } @@ -1866,19 +1866,19 @@ void process_send_log(struct list *logsrvs, int level, int facility, * The arguments and are used for the structured-data part * in RFC5424 formatted syslog messages. */ -void __send_log(struct list *logsrvs, struct buffer *tagb, int level, +void __send_log(struct list *loggers, struct buffer *tagb, int level, char *message, size_t size, char *sd, size_t sd_size) { static THREAD_LOCAL pid_t curr_pid; static THREAD_LOCAL char pidstr[16]; static THREAD_LOCAL struct ist metadata[LOG_META_FIELDS]; - if (logsrvs == NULL) { - if (!LIST_ISEMPTY(&global.logsrvs)) { - logsrvs = &global.logsrvs; + if (loggers == NULL) { + if (!LIST_ISEMPTY(&global.loggers)) { + loggers = &global.loggers; } } - if (!logsrvs || LIST_ISEMPTY(logsrvs)) + if (!loggers || LIST_ISEMPTY(loggers)) return; if (!metadata[LOG_META_HOST].len) { @@ -1907,7 +1907,7 @@ void __send_log(struct list *logsrvs, struct buffer *tagb, int level, while (metadata[LOG_META_STDATA].len && metadata[LOG_META_STDATA].ptr[metadata[LOG_META_STDATA].len-1] == ' ') metadata[LOG_META_STDATA].len--; - return process_send_log(logsrvs, level, -1, metadata, message, size); + return process_send_log(loggers, level, -1, metadata, message, size); } const char sess_cookie[8] = "NIDVEOU7"; /* No cookie, Invalid cookie, cookie for a Down server, Valid cookie, Expired cookie, Old cookie, Unused, unknown */ @@ -3174,7 +3174,7 @@ void strm_log(struct stream *s) if (!err && (sess->fe->options2 & PR_O2_NOLOGNORM)) return; - if (LIST_ISEMPTY(&sess->fe->logsrvs)) + if (LIST_ISEMPTY(&sess->fe->loggers)) return; if (s->logs.level) { /* loglevel was overridden */ @@ -3203,7 +3203,7 @@ void strm_log(struct stream *s) size = build_logline(s, logline, global.max_syslog_len, &sess->fe->logformat); if (size > 0) { _HA_ATOMIC_INC(&sess->fe->log_count); - __send_log(&sess->fe->logsrvs, &sess->fe->log_tag, level, + __send_log(&sess->fe->loggers, &sess->fe->log_tag, level, logline, size + 1, logline_rfc5424, sd_size); s->logs.logwait = 0; } @@ -3226,7 +3226,7 @@ void sess_log(struct session *sess) if (!sess) return; - if (LIST_ISEMPTY(&sess->fe->logsrvs)) + if (LIST_ISEMPTY(&sess->fe->loggers)) return; level = LOG_INFO; @@ -3245,12 +3245,12 @@ void sess_log(struct session *sess) size = sess_build_logline(sess, NULL, logline, global.max_syslog_len, &sess->fe->logformat); if (size > 0) { _HA_ATOMIC_INC(&sess->fe->log_count); - __send_log(&sess->fe->logsrvs, &sess->fe->log_tag, level, + __send_log(&sess->fe->loggers, &sess->fe->log_tag, level, logline, size + 1, logline_rfc5424, sd_size); } } -void app_log(struct list *logsrvs, struct buffer *tag, int level, const char *format, ...) +void app_log(struct list *loggers, struct buffer *tag, int level, const char *format, ...) { va_list argp; int data_len; @@ -3264,7 +3264,7 @@ void app_log(struct list *logsrvs, struct buffer *tag, int level, const char *fo data_len = global.max_syslog_len; va_end(argp); - __send_log(logsrvs, tag, level, logline, data_len, default_rfc5424_sd_log_format, 2); + __send_log(loggers, tag, level, logline, data_len, default_rfc5424_sd_log_format, 2); } /* * This function parse a received log message , of size @@ -3638,7 +3638,7 @@ void syslog_fd_handler(int fd) parse_log_message(buf->area, buf->data, &level, &facility, metadata, &message, &size); - process_send_log(&l->bind_conf->frontend->logsrvs, level, facility, metadata, message, size); + process_send_log(&l->bind_conf->frontend->loggers, level, facility, metadata, message, size); } while (--max_accept); } @@ -3750,7 +3750,7 @@ static void syslog_io_handler(struct appctx *appctx) parse_log_message(buf->area, buf->data, &level, &facility, metadata, &message, &size); - process_send_log(&frontend->logsrvs, level, facility, metadata, message, size); + process_send_log(&frontend->loggers, level, facility, metadata, message, size); } @@ -3995,7 +3995,7 @@ int cfg_parse_log_forward(const char *file, int linenum, char **args, int kwm) } } else if (strcmp(args[0], "log") == 0) { - if (!parse_logsrv(args, &cfg_log_forward->logsrvs, (kwm == KWM_NO), file, linenum, &errmsg)) { + if (!parse_logger(args, &cfg_log_forward->loggers, (kwm == KWM_NO), file, linenum, &errmsg)) { ha_alert("parsing [%s:%d] : %s : %s\n", file, linenum, args[0], errmsg); err_code |= ERR_ALERT | ERR_FATAL; goto out; @@ -4044,21 +4044,21 @@ out: return err_code; } -/* function: post-resolve a single list of logsrvs +/* function: post-resolve a single list of loggers * * 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. */ -int postresolve_logsrv_list(struct list *logsrvs, const char *section, const char *section_name) +int postresolve_logger_list(struct list *loggers, const char *section, const char *section_name) { int err_code = ERR_NONE; - struct logsrv *logsrv; + struct logger *logger; - list_for_each_entry(logsrv, logsrvs, list) { + list_for_each_entry(logger, loggers, list) { int cur_code; char *msg = NULL; - cur_code = resolve_logsrv(logsrv, &msg); + cur_code = resolve_logger(logger, &msg); if (msg) { void (*e_func)(const char *fmt, ...) = NULL; @@ -4069,11 +4069,11 @@ int postresolve_logsrv_list(struct list *logsrvs, const char *section, const cha else e_func = ha_diag_warning; if (!section) - e_func("global log server declared in file %s at line '%d' %s.\n", - logsrv->conf.file, logsrv->conf.line, msg); + e_func("global log directive declared in file %s at line '%d' %s.\n", + logger->conf.file, logger->conf.line, msg); else - e_func("log server declared in %s section '%s' in file '%s' at line %d %s.\n", - section, section_name, logsrv->conf.file, logsrv->conf.line, msg); + e_func("log directive declared in %s section '%s' in file '%s' at line %d %s.\n", + section, section_name, logger->conf.file, logger->conf.line, msg); ha_free(&msg); } err_code |= cur_code; @@ -4084,19 +4084,19 @@ int postresolve_logsrv_list(struct list *logsrvs, const char *section, const cha /* resolve default log directives at end of config. Returns 0 on success * otherwise error flags. */ -static int postresolve_logsrvs() +static int postresolve_loggers() { struct proxy *px; int err_code = ERR_NONE; /* global log directives */ - err_code |= postresolve_logsrv_list(&global.logsrvs, NULL, NULL); + err_code |= postresolve_logger_list(&global.loggers, NULL, NULL); /* proxy log directives */ for (px = proxies_list; px; px = px->next) - err_code |= postresolve_logsrv_list(&px->logsrvs, "proxy", px->id); + err_code |= postresolve_logger_list(&px->loggers, "proxy", px->id); /* log-forward log directives */ for (px = cfg_log_forward; px; px = px->next) - err_code |= postresolve_logsrv_list(&px->logsrvs, "log-forward", px->id); + err_code |= postresolve_logger_list(&px->loggers, "log-forward", px->id); return err_code; } @@ -4104,7 +4104,7 @@ static int postresolve_logsrvs() /* config parsers for this section */ REGISTER_CONFIG_SECTION("log-forward", cfg_parse_log_forward, NULL); -REGISTER_POST_CHECK(postresolve_logsrvs); +REGISTER_POST_CHECK(postresolve_loggers); REGISTER_PER_THREAD_ALLOC(init_log_buffers); REGISTER_PER_THREAD_FREE(deinit_log_buffers); diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c index bc438c659..ac2f9cc38 100644 --- a/src/mux_fcgi.c +++ b/src/mux_fcgi.c @@ -2372,7 +2372,7 @@ static int fcgi_strm_handle_stderr(struct fcgi_conn *fconn, struct fcgi_strm *fs trash.area[ret] = '\n'; trash.area[ret+1] = '\0'; tag.area = fconn->app->name; tag.data = strlen(fconn->app->name); - app_log(&fconn->app->logsrvs, &tag, LOG_ERR, "%s", trash.area); + app_log(&fconn->app->loggers, &tag, LOG_ERR, "%s", trash.area); if (fconn->drl) goto fail; diff --git a/src/proxy.c b/src/proxy.c index 80b64f3bd..999fc7f9e 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -153,7 +153,7 @@ void free_proxy(struct proxy *p) struct server_rule *srule, *sruleb; struct switching_rule *rule, *ruleb; struct redirect_rule *rdr, *rdrb; - struct logsrv *log, *logb; + struct logger *log, *logb; struct logformat_node *lf, *lfb; struct proxy_deinit_fct *pxdf; struct server_deinit_fct *srvdf; @@ -237,9 +237,9 @@ void free_proxy(struct proxy *p) http_free_redirect_rule(rdr); } - list_for_each_entry_safe(log, logb, &p->logsrvs, list) { + list_for_each_entry_safe(log, logb, &p->loggers, list) { LIST_DEL_INIT(&log->list); - free_logsrv(log); + free_logger(log); } list_for_each_entry_safe(lf, lfb, &p->logformat, list) { @@ -1362,7 +1362,7 @@ void init_new_proxy(struct proxy *p) LIST_INIT(&p->tcp_req.l4_rules); LIST_INIT(&p->tcp_req.l5_rules); MT_LIST_INIT(&p->listener_queue); - LIST_INIT(&p->logsrvs); + LIST_INIT(&p->loggers); LIST_INIT(&p->logformat); LIST_INIT(&p->logformat_sd); LIST_INIT(&p->format_unique_id); @@ -1452,7 +1452,7 @@ void proxy_preset_defaults(struct proxy *defproxy) void proxy_free_defaults(struct proxy *defproxy) { struct acl *acl, *aclb; - struct logsrv *log, *logb; + struct logger *log, *logb; struct cap_hdr *h,*h_next; ha_free(&defproxy->id); @@ -1515,9 +1515,9 @@ void proxy_free_defaults(struct proxy *defproxy) if (defproxy->conf.logformat_sd_string != default_rfc5424_sd_log_format) ha_free(&defproxy->conf.logformat_sd_string); - list_for_each_entry_safe(log, logb, &defproxy->logsrvs, list) { + list_for_each_entry_safe(log, logb, &defproxy->loggers, list) { LIST_DEL_INIT(&log->list); - free_logsrv(log); + free_logger(log); } ha_free(&defproxy->conf.uniqueid_format_string); @@ -1637,7 +1637,7 @@ struct proxy *alloc_new_proxy(const char *name, unsigned int cap, char **errmsg) static int proxy_defproxy_cpy(struct proxy *curproxy, const struct proxy *defproxy, char **errmsg) { - struct logsrv *tmplogsrv; + struct logger *tmplogger; char *tmpmsg = NULL; /* set default values from the specified default proxy */ @@ -1816,15 +1816,15 @@ static int proxy_defproxy_cpy(struct proxy *curproxy, const struct proxy *defpro curproxy->mode = defproxy->mode; curproxy->uri_auth = defproxy->uri_auth; /* for stats */ - /* copy default logsrvs to curproxy */ - list_for_each_entry(tmplogsrv, &defproxy->logsrvs, list) { - struct logsrv *node = dup_logsrv(tmplogsrv); + /* copy default loggers to curproxy */ + list_for_each_entry(tmplogger, &defproxy->loggers, list) { + struct logger *node = dup_logger(tmplogger); if (!node) { memprintf(errmsg, "proxy '%s': out of memory", curproxy->id); return 1; } - LIST_APPEND(&curproxy->logsrvs, &node->list); + LIST_APPEND(&curproxy->loggers, &node->list); } curproxy->conf.uniqueid_format_string = defproxy->conf.uniqueid_format_string; diff --git a/src/sink.c b/src/sink.c index 785465a2d..c9c83a7db 100644 --- a/src/sink.c +++ b/src/sink.c @@ -1172,9 +1172,9 @@ err: return err_code; } -/* Creates a new sink buffer from a log server. +/* Creates a new sink buffer from a logger. * - * It uses the logsrvaddress to declare a forward + * It uses the logger's address to declare a forward * server for this buffer. And it initializes the * forwarding. * @@ -1184,9 +1184,9 @@ err: * it returns NULL. * * Note: the sink is created using the name - * specified into logsrv->ring_name + * specified into logger->ring_name */ -static struct sink *sink_new_from_logsrv(struct logsrv *logsrv) +struct sink *sink_new_from_logger(struct logger *logger) { struct sink *sink = NULL; struct server *srv = NULL; @@ -1194,21 +1194,21 @@ static struct sink *sink_new_from_logsrv(struct logsrv *logsrv) /* prepare description for the sink */ chunk_reset(&trash); - chunk_printf(&trash, "created from logserver declared into '%s' at line %d", logsrv->conf.file, logsrv->conf.line); + chunk_printf(&trash, "created from log directive declared into '%s' at line %d", logger->conf.file, logger->conf.line); /* allocate a new sink buffer */ - sink = sink_new_ringbuf(logsrv->ring_name, trash.area, logsrv->conf.file, logsrv->conf.line, &err_msg); + sink = sink_new_ringbuf(logger->ring_name, trash.area, logger->conf.file, logger->conf.line, &err_msg); if (!sink) { ha_alert("%s.\n", err_msg); ha_free(&err_msg); goto error; } - /* disable sink->maxlen, we already have logsrv->maxlen */ + /* disable sink->maxlen, we already have logger->maxlen */ sink->maxlen = 0; - /* set ring format from logsrv format */ - sink->fmt = logsrv->format; + /* set ring format from logger format */ + sink->fmt = logger->format; /* Set default connect and server timeout for sink forward proxy */ sink->forward_px->timeout.connect = MS_TO_TICKS(1000); @@ -1222,11 +1222,11 @@ static struct sink *sink_new_from_logsrv(struct logsrv *logsrv) goto error; /* init server */ - srv->id = strdup(logsrv->ring_name); - srv->conf.file = strdup(logsrv->conf.file); - srv->conf.line = logsrv->conf.line; - srv->addr = logsrv->addr; - srv->svc_port = get_host_port(&logsrv->addr); + srv->id = strdup(logger->ring_name); + srv->conf.file = strdup(logger->conf.file); + srv->conf.line = logger->conf.line; + srv->addr = logger->addr; + srv->svc_port = get_host_port(&logger->addr); HA_SPIN_INIT(&srv->lock); /* process per thread init */ @@ -1242,8 +1242,8 @@ static struct sink *sink_new_from_logsrv(struct logsrv *logsrv) if (sink_finalize(sink) & ERR_CODE) goto error_final; - /* reset familyt of logsrv to consider the ring buffer target */ - logsrv->addr.ss_family = AF_UNSPEC; + /* reset familyt of logger to consider the ring buffer target */ + logger->addr.ss_family = AF_UNSPEC; return sink; error: @@ -1271,7 +1271,7 @@ int cfg_post_parse_ring() return err_code; } -/* function: resolve a single logsrv target of BUFFER type +/* function: resolve a single logger target of BUFFER type * * 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. @@ -1279,7 +1279,7 @@ int cfg_post_parse_ring() * could also be set when no error occured to report a diag warning), thus is * up to the caller to check it and to free it. */ -int sink_resolve_logsrv_buffer(struct logsrv *target, char **msg) +int sink_resolve_logger_buffer(struct logger *target, char **msg) { int err_code = ERR_NONE; struct sink *sink; @@ -1289,10 +1289,10 @@ int sink_resolve_logsrv_buffer(struct logsrv *target, char **msg) if (!sink) { /* LOG_TARGET_BUFFER but !AF_UNSPEC * means we must allocate a sink - * buffer to send messages to this logsrv + * buffer to send messages to this logger */ if (target->addr.ss_family != AF_UNSPEC) { - sink = sink_new_from_logsrv(target); + sink = sink_new_from_logger(target); if (!sink) { memprintf(msg, "cannot be initialized (failed to create implicit ring)"); err_code |= ERR_ALERT | ERR_FATAL;