From 143ea3c8613ffa718e7149cb0afcf160fa620471 Mon Sep 17 00:00:00 2001 From: DOMjudge team Date: Sat, 13 Apr 2024 21:11:22 +0200 Subject: [PATCH] Custom nginx log format adding request processing time --- .../roles/domserver/templates/nginx-domjudge-inner.j2 | 6 +++--- .../roles/domserver/templates/nginx-domjudge.conf.j2 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/provision-contest/ansible/roles/domserver/templates/nginx-domjudge-inner.j2 b/provision-contest/ansible/roles/domserver/templates/nginx-domjudge-inner.j2 index 7e0d1904..8e14601c 100644 --- a/provision-contest/ansible/roles/domserver/templates/nginx-domjudge-inner.j2 +++ b/provision-contest/ansible/roles/domserver/templates/nginx-domjudge-inner.j2 @@ -18,7 +18,7 @@ location / { location /api/ { try_files $uri @domjudgeFrontApi; error_log /var/log/nginx/domjudge-api.log; - access_log /var/log/nginx/domjudge-api.log; + access_log /var/log/nginx/domjudge-api.log dj_access; } } @@ -52,7 +52,7 @@ location @domjudgeFrontApi { # Use a separate log file for the API error_log /var/log/nginx/domjudge-api.log; - access_log /var/log/nginx/domjudge-api.log; + access_log /var/log/nginx/domjudge-api.log dj_access; } # The X-Frame-Options header defends against so-called 'clickjacking' attacks. @@ -66,4 +66,4 @@ add_header X-Content-Type-Options "nosniff"; add_header X-XSS-Protection "1; mode=block"; error_log /var/log/nginx/domjudge.log; -access_log /var/log/nginx/domjudge.log; +access_log /var/log/nginx/domjudge.log dj_access; diff --git a/provision-contest/ansible/roles/domserver/templates/nginx-domjudge.conf.j2 b/provision-contest/ansible/roles/domserver/templates/nginx-domjudge.conf.j2 index 3e005e7b..9fc5e3de 100644 --- a/provision-contest/ansible/roles/domserver/templates/nginx-domjudge.conf.j2 +++ b/provision-contest/ansible/roles/domserver/templates/nginx-domjudge.conf.j2 @@ -7,6 +7,9 @@ upstream domjudge { server unix:/var/run/php-fpm-domjudge.sock; # if using with etc/domjudge-fpm.conf } +# Custom log format that adds the request processing time. +log_format dj_access '$remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent $request_time "$http_referer" "$http_user_agent"'; + server { listen 80 default; server_name _default_;