mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-02-03 16:31:08 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: log: Provide a function to emit a log for an application

Browse Source 
Application is a generic term here. It is a modules which handle its own log
server list, with no dependency on a proxy. Such applications can now call the
function app_log() to log messages, passing a log server list and a tag as
parameters. Internally, the function __send_log() has been adapted accordingly.
This commit is contained in:
Christopher Faulet 2019-08-11 19:40:12 +02:00
parent 130cf21709
commit 5c6fefc8eb
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/proto/log.h
View File

@ -87,6 +87,10 @@ static inline int build_logline(struct stream *s, char *dst, size_t maxsize, str
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, ...)
__attribute__ ((format(printf, 4, 5)));
/*
* add to the logformat linked list
*/
@ -141,7 +145,7 @@ void send_log(struct proxy *p, int level, const char *format, ...)
* It doesn't care about errors nor does it report them.
*/
void __send_log(struct proxy *p, int level, char *message, size_t size, char *sd, size_t sd_size);
void __send_log(struct list *logsrvs, struct buffer *tag, int level, char *message, size_t size, char *sd, size_t sd_size);
/*
* returns log format for <fmt> or -1 if not found.

44
src/log.c
View File

@ -1479,7 +1479,8 @@ void send_log(struct proxy *p, int level, const char *format, ...)
data_len = global.max_syslog_len;
va_end(argp);
__send_log(p, level, logline, data_len, default_rfc5424_sd_log_format, 2);
__send_log((p ? &p->logsrvs : NULL), (p ? &p->log_tag : NULL), level,
logline, data_len, default_rfc5424_sd_log_format, 2);
}
/*
@ -1731,30 +1732,24 @@ send:
* The arguments <sd> and <sd_size> are used for the structured-data part
* in RFC5424 formatted syslog messages.
*/
void __send_log(struct proxy *p, int level, char *message, size_t size, char *sd, size_t sd_size)
void __send_log(struct list *logsrvs, struct buffer *tag, int level,
char *message, size_t size, char *sd, size_t sd_size)
{
struct list *logsrvs = NULL;
struct logsrv *logsrv;
int nblogger;
static THREAD_LOCAL int curr_pid;
static THREAD_LOCAL char pidstr[100];
static THREAD_LOCAL struct buffer pid;
struct buffer *tag = &global.log_tag;
if (p == NULL) {
if (logsrvs == NULL) {
if (!LIST_ISEMPTY(&global.logsrvs)) {
logsrvs = &global.logsrvs;
}
} else {
if (!LIST_ISEMPTY(&p->logsrvs)) {
logsrvs = &p->logsrvs;
}
if (p->log_tag.area) {
tag = &p->log_tag;
}
}
if (!tag || !tag->area)
tag = &global.log_tag;
if (!logsrvs)
if (!logsrvs || LIST_ISEMPTY(logsrvs))
return;
if (unlikely(curr_pid != getpid())) {
@ -2971,7 +2966,8 @@ void strm_log(struct stream *s)
size = build_logline(s, logline, global.max_syslog_len, &sess->fe->logformat);
if (size > 0) {
_HA_ATOMIC_ADD(&sess->fe->log_count, 1);
__send_log(sess->fe, level, logline, size + 1, logline_rfc5424, sd_size);
__send_log(&sess->fe->logsrvs, &sess->fe->log_tag, level,
logline, size + 1, logline_rfc5424, sd_size);
s->logs.logwait = 0;
}
}
@ -3009,10 +3005,28 @@ 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_ADD(&sess->fe->log_count, 1);
__send_log(sess->fe, level, logline, size + 1, logline_rfc5424, sd_size);
__send_log(&sess->fe->logsrvs, &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, ...)
{
va_list argp;
int data_len;
if (level < 0 || format == NULL || logline == NULL)
return;
va_start(argp, format);
data_len = vsnprintf(logline, global.max_syslog_len, format, argp);
if (data_len < 0 || data_len > global.max_syslog_len)
data_len = global.max_syslog_len;
va_end(argp);
__send_log(logsrvs, tag, level, logline, data_len, default_rfc5424_sd_log_format, 2);
}
static int cli_io_handler_show_startup_logs(struct appctx *appctx)
{
struct stream_interface *si = appctx->owner;