summaryrefslogtreecommitdiff
path: root/src/libtipidee
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-10-12 02:46:37 +0000
committerLaurent Bercot <ska@appnovation.com>2023-10-12 02:46:37 +0000
commitd9492e8561fe5373b1428c6d7cff4f25e2796a55 (patch)
tree8e0b77e1b8f4964f9a154ce89209f25e093a0f8f /src/libtipidee
parent541325d00c7078d063ea97333d3c9c64d6b6c7b6 (diff)
downloadtipidee-d9492e8561fe5373b1428c6d7cff4f25e2796a55.tar.xz
Add host_as_prefix logging for request/resource/answer
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/libtipidee')
-rw-r--r--src/libtipidee/tipidee_log_answer.c19
-rw-r--r--src/libtipidee/tipidee_log_request.c17
-rw-r--r--src/libtipidee/tipidee_log_resource.c17
-rw-r--r--src/libtipidee/tipidee_log_start.c4
4 files changed, 44 insertions, 13 deletions
diff --git a/src/libtipidee/tipidee_log_answer.c b/src/libtipidee/tipidee_log_answer.c
index beedb61..b6e4617 100644
--- a/src/libtipidee/tipidee_log_answer.c
+++ b/src/libtipidee/tipidee_log_answer.c
@@ -8,17 +8,26 @@
#include <tipidee/log.h>
-void tipidee_log_answer (uint32_t v, unsigned int status, off_t size)
+void tipidee_log_answer (uint32_t v, tipidee_rql const *rql, unsigned int status, off_t size)
{
+ char const *a[6] = { PROG, ": info:" } ;
+ size_t m = 2 ;
char fmtstatus[UINT_FMT] ;
+ char fmtsize[UINT64_FMT] ;
if (!(v & TIPIDEE_LOG_ANSWER)) return ;
+ if (v & TIPIDEE_LOG_HOSTASPREFIX)
+ {
+ a[m++] = " host " ;
+ a[m++] = rql->uri.host ;
+ }
fmtstatus[uint_fmt(fmtstatus, status)] = 0 ;
+ a[m++] = " answer " ;
+ a[m++] = fmtstatus ;
if (size)
{
- char fmtsize[UINT64_FMT] ;
fmtsize[uint64_fmt(fmtsize, size)] = 0 ;
- strerr_warni4x("answer ", fmtstatus, " size ", fmtsize) ;
+ a[m++] = " size " ;
+ a[m++] = fmtsize ;
}
- else
- strerr_warni2x("answer ", fmtstatus) ;
+ strerr_warnv(a, m) ;
}
diff --git a/src/libtipidee/tipidee_log_request.c b/src/libtipidee/tipidee_log_request.c
index 666297d..a789ca5 100644
--- a/src/libtipidee/tipidee_log_request.c
+++ b/src/libtipidee/tipidee_log_request.c
@@ -11,8 +11,8 @@
void tipidee_log_request (uint32_t v, tipidee_rql const *rql, char const *referrer, char const *ua, stralloc *sa)
{
- char const *a[14] = { "info: request " } ;
- size_t m = 1 ;
+ char const *a[16] = { PROG, ": info:" } ;
+ size_t m = 2 ;
size_t start = sa->len ;
size_t refpos = start, uapos = start ;
if (!(v & TIPIDEE_LOG_REQUEST)) return ;
@@ -27,9 +27,18 @@ void tipidee_log_request (uint32_t v, tipidee_rql const *rql, char const *referr
uapos = sa->len ;
if (!string_quotes(sa, ua) || !stralloc_0(sa)) goto err ;
}
+ if (v & TIPIDEE_LOG_HOSTASPREFIX)
+ {
+ a[m++] = " host " ;
+ a[m++] = rql->uri.host ;
+ }
+ a[m++] = " request " ;
a[m++] = tipidee_method_tostr(rql->m) ;
- a[m++] = " host " ;
- a[m++] = rql->uri.host ;
+ if (!(v & TIPIDEE_LOG_HOSTASPREFIX))
+ {
+ a[m++] = " host " ;
+ a[m++] = rql->uri.host ;
+ }
a[m++] = " path " ;
a[m++] = sa->s + start ;
if (rql->uri.query)
diff --git a/src/libtipidee/tipidee_log_resource.c b/src/libtipidee/tipidee_log_resource.c
index dc525a5..6387027 100644
--- a/src/libtipidee/tipidee_log_resource.c
+++ b/src/libtipidee/tipidee_log_resource.c
@@ -4,8 +4,21 @@
#include <tipidee/log.h>
-void tipidee_log_resource (uint32_t v, char const *docroot, char const *file, tipidee_resattr const *ra)
+void tipidee_log_resource (uint32_t v, tipidee_rql const *rql, char const *docroot, char const *file, tipidee_resattr const *ra)
{
+ char const *a[8] = { PROG, ": info:" } ;
+ size_t m = 2 ;
if (!(v & TIPIDEE_LOG_RESOURCE)) return ;
- strerr_warni6x("docroot ", docroot, " file ", file, " type ", ra->iscgi ? ra->isnph ? "nph" : "cgi" : ra->content_type) ;
+ if (v & TIPIDEE_LOG_HOSTASPREFIX)
+ {
+ a[m++] = " host " ;
+ a[m++] = rql->uri.host ;
+ }
+ a[m++] = " docroot " ;
+ a[m++] = docroot ;
+ a[m++] = " file " ;
+ a[m++] = file ;
+ a[m++] = " type " ;
+ a[m++] = ra->iscgi ? ra->isnph ? "nph" : "cgi" : ra->content_type ;
+ strerr_warnv(a, m) ;
}
diff --git a/src/libtipidee/tipidee_log_start.c b/src/libtipidee/tipidee_log_start.c
index 34284af..b280301 100644
--- a/src/libtipidee/tipidee_log_start.c
+++ b/src/libtipidee/tipidee_log_start.c
@@ -8,8 +8,8 @@
void tipidee_log_start (uint32_t v, char const *ip, char const *host)
{
- char const *a[5] = { "info: start" } ;
- size_t m = 1 ;
+ char const *a[6] = { PROG, ": info: start" } ;
+ size_t m = 2 ;
if (!(v & TIPIDEE_LOG_START)) return ;
if (v & TIPIDEE_LOG_CLIENTIP)
{