From 593f35f78e82fd103c90c7061980ca249a1c0f37 Mon Sep 17 00:00:00 2001
From: Alfredo Deza <adeza@redhat.com>
Date: Thu, 14 Jul 2016 16:42:28 -0400
Subject: [PATCH] ansible: define logging for upstream load balancing

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---
 ansible/roles/nginx/templates/nginx.conf | 88 ++++++++++++------------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/ansible/roles/nginx/templates/nginx.conf b/ansible/roles/nginx/templates/nginx.conf
index 1cb6fb5f..dfb45184 100644
--- a/ansible/roles/nginx/templates/nginx.conf
+++ b/ansible/roles/nginx/templates/nginx.conf
@@ -6,56 +6,58 @@ worker_rlimit_nofile 8192;
 pid /var/run/nginx.pid;
 
 events {
-	worker_connections 1024;
-	# multi_accept on;
+    worker_connections 1024;
+    # multi_accept on;
 }
 
 http {
 
-	##
-	# Basic Settings
-	##
+    ##
+    # Basic Settings
+    ##
 
-	#sendfile on;
-	tcp_nopush on;
-	tcp_nodelay on;
-	keepalive_timeout 65;
-	types_hash_max_size 2048;
-	server_tokens off;
+    #sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 65;
+    types_hash_max_size 2048;
+    server_tokens off;
 
-	# server_names_hash_bucket_size 64;
-	# server_name_in_redirect off;
-	include /etc/nginx/mime.types;
-	default_type application/octet-stream;
+    # server_names_hash_bucket_size 64;
+    # server_name_in_redirect off;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
 
-	##
-	# Logging Settings
-	##
-	access_log /var/log/nginx/access.log;
-	error_log /var/log/nginx/error.log;
+    ##
+    # Logging Settings
+    ##
+    # Useful for logging load balancing requests
+    log_format upstreamlog '[$time_local] $remote_addr - backend: $upstream_addr $request upstream_response_time $upstream_response_time request_time $request_time';
+    access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;
 
-	##
-	# Gzip Settings
-	##
+    ##
+    # Gzip Settings
+    ##
 
-	gzip on;
-	gzip_disable "msie6";
+    gzip on;
+    gzip_disable "msie6";
 
-	# gzip_vary on;
-	# gzip_proxied any;
-	# gzip_comp_level 6;
-	# gzip_buffers 16 8k;
-	# gzip_http_version 1.1;
-	# gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+    # gzip_vary on;
+    # gzip_proxied any;
+    # gzip_comp_level 6;
+    # gzip_buffers 16 8k;
+    # gzip_http_version 1.1;
+    # gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
 
-	##
-	# If HTTPS, then set a variable so it can be passed along.
-	##
+    ##
+    # If HTTPS, then set a variable so it can be passed along.
+    ##
 
-	map $scheme $server_https {
-		default off;
-		https on;
-	}
+    map $scheme $server_https {
+        default off;
+        https on;
+    }
 
     {% for upstream in nginx_upstreams %}
         upstream {{ upstream.name }} {
@@ -68,10 +70,10 @@ http {
     }
     {% endfor %}
 
-	##
-	# Virtual Host Configs
-	##
+    ##
+    # Virtual Host Configs
+    ##
 
-	include /etc/nginx/conf.d/*.conf;
-	include /etc/nginx/sites-enabled/*;
+    include /etc/nginx/conf.d/*.conf;
+    include /etc/nginx/sites-enabled/*;
 }
-- 
2.39.5