Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: modules/nginx/templates/nginx.conf.erb

Issue 29328450: Issue 3102 - Introduce log_format "data" for storing POST messages (Closed)
Patch Set: Issue 3102 - Now the other way around Created Sept. 21, 2015, 11:53 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 user <%= scope.lookupvar('nginx::params::user') %> <%= scope.lookupvar('nginx::p arams::group') %>; 1 user <%= scope.lookupvar('nginx::params::user') %> <%= scope.lookupvar('nginx::p arams::group') %>;
2 worker_processes <%= worker_processes %>; 2 worker_processes <%= worker_processes %>;
3 3
4 error_log /var/log/nginx/error.log notice; 4 error_log /var/log/nginx/error.log notice;
5 pid /var/run/nginx.pid; 5 pid /var/run/nginx.pid;
6 6
7 events { 7 events {
8 worker_connections <%= worker_connections %>; 8 worker_connections <%= worker_connections %>;
9 <% if scope.lookupvar('nginx::params::multi_accept') == 'on' %>multi_accept on ;<% end %> 9 <% if scope.lookupvar('nginx::params::multi_accept') == 'on' %>multi_accept on ;<% end %>
10 } 10 }
11 worker_rlimit_nofile <%= scope.lookupvar('nginx::params::worker_rlimit_nofile') %>; 11 worker_rlimit_nofile <%= scope.lookupvar('nginx::params::worker_rlimit_nofile') %>;
12 12
13 http { 13 http {
14 include /etc/nginx/mime.types; 14 include /etc/nginx/mime.types;
15 default_type application/octet-stream; 15 default_type application/octet-stream;
16 16
17 log_format main '$remote_addr - $remote_user [$time_local] "$request" ' 17 log_format main '$remote_addr - $remote_user [$time_local] "$request" '
18 '$status $bytes_sent "$http_referer" ' 18 '$status $bytes_sent "$http_referer" '
19 '"$http_user_agent" "$http_x_forwarded_for" $scheme ' 19 '"$http_user_agent" "$http_x_forwarded_for" $scheme '
20 '"$http_accept_language" "$http_host" "$http_x_client_id"'; 20 '"$http_accept_language" "$http_host" "$http_x_client_id"';
21 21
22 log_format data '[$time_local] "$request" $status "$http_user_agent" '
Felix Dahlke 2015/09/21 18:30:45 Why not have the same fields as with "main" here,
Felix Dahlke 2015/09/21 18:30:45 Do we have more than one use case for this? Will f
mathias 2015/09/21 18:38:53 Yes the filter hit statistics are meant to use the
mathias 2015/09/21 18:38:53 Because the data is meant to be anonymous. There i
Felix Dahlke 2015/09/21 20:15:51 While it's not relevant for the Adblock Browser da
mathias 2015/09/21 21:38:41 In fact most of the fields currently matching thos
23 '$http_content_length "$http_content_type" $request_body';
24
22 access_log /var/log/nginx/access.log main; 25 access_log /var/log/nginx/access.log main;
23 server_tokens off; 26 server_tokens off;
24 27
25 sendfile <%= scope.lookupvar('nginx::params::sendfile')%>; 28 sendfile <%= scope.lookupvar('nginx::params::sendfile')%>;
26 29
27 <% if scope.lookupvar('nginx::params::tcp_nopush') == 'on' %> 30 <% if scope.lookupvar('nginx::params::tcp_nopush') == 'on' %>
28 tcp_nopush on; 31 tcp_nopush on;
29 <% end %> 32 <% end %>
30 33
31 keepalive_timeout <%= scope.lookupvar('nginx::params::keepalive_timeout') %>; 34 keepalive_timeout <%= scope.lookupvar('nginx::params::keepalive_timeout') %>;
(...skipping 23 matching lines...) Expand all
55 <% if @geoip_country %> 58 <% if @geoip_country %>
56 geoip_country <%= @geoip_country %>; 59 geoip_country <%= @geoip_country %>;
57 <% end %> 60 <% end %>
58 <% if @geoip_city %> 61 <% if @geoip_city %>
59 geoip_city <%= @geoip_city %>; 62 geoip_city <%= @geoip_city %>;
60 <% end %> 63 <% end %>
61 64
62 include /etc/nginx/conf.d/*.conf; 65 include /etc/nginx/conf.d/*.conf;
63 include /etc/nginx/sites-enabled/*; 66 include /etc/nginx/sites-enabled/*;
64 } 67 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld