Ottomata has submitted this change and it was merged. Change subject: Log correctly encoded url with parameters for nginx ......................................................................
Log correctly encoded url with parameters for nginx $uri uses \x escaping instead of % and does not contain the request parameters. So we switch to $request_uri, which escapes using %, and contains the request parameters. Thereby we lessen impact of bug 58316 and directly address bug 58876. Bug: 58876 Change-Id: I400932069e993fce13c20ea039eb0f022cea83bf --- M templates/nginx/nginx.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ottomata: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/templates/nginx/nginx.conf.erb b/templates/nginx/nginx.conf.erb index e18cdb3..4e58241 100644 --- a/templates/nginx/nginx.conf.erb +++ b/templates/nginx/nginx.conf.erb @@ -39,7 +39,7 @@ access_log /var/log/nginx/access.log; <% if has_variable?("nginx_use_ssl") then %> - log_format squid_combined '$hostname $udplog_sequence $udplog_time $request_time $remote_addr -/$status $bytes_sent $request_method $scheme://$host$uri NONE/$proxy_host $content_type $http_referer $http_x_forwarded_for $udplog_escaped_user_agent $http_accept_language $http_x_cs'; + log_format squid_combined '$hostname $udplog_sequence $udplog_time $request_time $remote_addr -/$status $bytes_sent $request_method $scheme://$host$request_uri NONE/$proxy_host $content_type $http_referer $http_x_forwarded_for $udplog_escaped_user_agent $http_accept_language $http_x_cs'; access_udplog 208.80.154.73:8419 squid_combined; client_max_body_size 100m; large_client_header_buffers 4 16k; -- To view, visit https://gerrit.wikimedia.org/r/105449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I400932069e993fce13c20ea039eb0f022cea83bf Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: QChris <christ...@quelltextlich.at> Gerrit-Reviewer: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits