Ottomata has submitted this change and it was merged.
Change subject: Stop nginx from escaping the user agent
......................................................................
Stop nginx from escaping the user agent
Nginx still escaped spaces in user agents. Since we switched to tabs
as separators, escaping (which mostly affected spaces) is more in the
way than it helps. Hence, we drop the escaping to match output we see
from varnish.
If user agents come with tabs, tabs are not escaped and the log line
columns after the user agent column shift further back. While that's
not ideal, we have the same problem for Varnish log lines --- and it
effectively does not affect us. So we prefer to have user agents
uniformly presented, even if it potentiall breaks a log line in corner
cases.
Change-Id: Ia8933d30a0672b6fe902ce698b17b578c1a27547
---
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 4e58241..dd2b34d 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$request_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 $http_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/105450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8933d30a0672b6fe902ce698b17b578c1a27547
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
