RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-16 02:26:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: log: move the log code to sess_build_logline() to add extra arguments

Browse Source 
The current build_logline() can only be used with valid streams, which
means it is not suitable for use from muxes. We start by moving it into
another more generic function which takes the session as an argument,
to avoid complexifying all the internal API for jsut a few use cases.
This new function is not supposed to be called directly from outside so
we'll be able to instrument it to support several calling conventions.

For now the behaviour and conditions remain unchanged.
This commit is contained in:
Willy Tarreau 2018-09-05 14:58:15 +02:00
parent ec3750c590
commit 43c538eab6
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/proto/log.h
View File

@ -34,6 +34,8 @@
#include <types/proxy.h>
#include <types/stream.h>
#include <proto/stream.h>
extern struct pool_head *pool_head_requri;
extern struct pool_head *pool_head_uniqueid;
@ -63,7 +65,13 @@ void deinit_log_buffers();
/*
* Builds a log line.
*/
int build_logline(struct stream *s, char *dst, size_t maxsize, struct list *list_format);
int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t maxsize, struct list *list_format);
static inline int build_logline(struct stream *s, char *dst, size_t maxsize, struct list *list_format)
{
return sess_build_logline(strm_sess(s), s, dst, maxsize, list_format);
}
/*
* send a log for the stream when we have enough info about it.

5
src/log.c
View File

@ -1566,11 +1566,10 @@ void deinit_log_buffers()
/* Builds a log line in <dst> based on <list_format>, and stops before reaching
* <maxsize> characters. Returns the size of the output string in characters,
* not counting the trailing zero which is always added if the resulting size
* is not zero.
* is not zero. It requires a session and a stream.
*/
int build_logline(struct stream *s, char *dst, size_t maxsize, struct list *list_format)
int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t maxsize, struct list *list_format)
{
struct session *sess = strm_sess(s);
struct proxy *fe = sess->fe;
struct proxy *be = s->be;
struct http_txn *txn = s->txn;