From ecaaf710b1d41cb7f4a33f7e7183b8c80b43484a Mon Sep 17 00:00:00 2001
From: "Zhou (Joe) Yuan" <yuanzhou19@gmail.com>
Date: Tue, 19 Jan 2021 00:03:27 -0500
Subject: [PATCH 1/7] Add new log_format

---
 hubmap-auth/nginx.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hubmap-auth/nginx.conf b/hubmap-auth/nginx.conf
index 1bf3e1d..ca91890 100644
--- a/hubmap-auth/nginx.conf
+++ b/hubmap-auth/nginx.conf
@@ -19,6 +19,9 @@ http {
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';
+    
+    # For better debugging upstream hubmap-auth service
+    log_format upstreamlog '[$time_local] $remote_addr - $remote_user - $server_name $host to: $upstream_addr: $request $status upstream_response_time $upstream_response_time msec $msec request_time $request_time';
 
     access_log  /var/log/nginx/access.log  main;
 

From ae41a3096afc67a325f109eea7c28ba2ae32a1eb Mon Sep 17 00:00:00 2001
From: "Zhou (Joe) Yuan" <yuanzhou19@gmail.com>
Date: Tue, 19 Jan 2021 00:06:24 -0500
Subject: [PATCH 2/7] Use new log_format and 127.0.0.1

---
 nginx/conf.d-prod/hubmap-auth.conf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nginx/conf.d-prod/hubmap-auth.conf b/nginx/conf.d-prod/hubmap-auth.conf
index a1b2299..7c4848e 100644
--- a/nginx/conf.d-prod/hubmap-auth.conf
+++ b/nginx/conf.d-prod/hubmap-auth.conf
@@ -90,7 +90,8 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api.log;
+    # Use the upstreamlog log_format defiend in the main nginx.conf for better debugging
+    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api.log upstreamlog;
     error_log /usr/src/app/log/nginx_error_gateway_for_ingest-api.log warn;
     
     location = /favicon.ico {
@@ -100,8 +101,8 @@ server {
     # Pass reqeusts to the uWSGI server using the "uwsgi" protocol on port 5000
     location / { 
         include uwsgi_params;
-        # Use "localhost" becuase the uWSGI server is also running on the same container
-        uwsgi_pass uwsgi://localhost:5000;
+        # Use "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+        uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 }
 

From 9228b7b8547203d5c245db874f375888407e2931 Mon Sep 17 00:00:00 2001
From: "Zhou (Joe) Yuan" <yuanzhou19@gmail.com>
Date: Tue, 19 Jan 2021 00:08:37 -0500
Subject: [PATCH 3/7] Update VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index bfa363e..8decb92 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.4
+1.8.5

From a0e0c9c1103ee52c1d9c4cc4c24b8479024d64d7 Mon Sep 17 00:00:00 2001
From: yuanzhou <yuanzhou19@gmail.com>
Date: Tue, 19 Jan 2021 11:03:45 -0500
Subject: [PATCH 4/7] Use Ipv4 instead of localhost for upstream

---
 nginx/conf.d-dev/hubmap-auth.conf   | 12 ++++++------
 nginx/conf.d-dev/ingest-ui.conf     |  3 ++-
 nginx/conf.d-dev/portal-ui.conf     |  3 ++-
 nginx/conf.d-prod/hubmap-auth.conf  | 10 +++++-----
 nginx/conf.d-prod/ingest-ui.conf    |  3 ++-
 nginx/conf.d-prod/portal-ui.conf    |  3 ++-
 nginx/conf.d-stage/hubmap-auth.conf | 12 ++++++------
 nginx/conf.d-stage/ingest-ui.conf   |  3 ++-
 nginx/conf.d-stage/portal-ui.conf   |  3 ++-
 nginx/conf.d-test/hubmap-auth.conf  | 10 +++++-----
 nginx/conf.d-test/ingest-ui.conf    |  3 ++-
 nginx/conf.d-test/portal-ui.conf    |  3 ++-
 12 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/nginx/conf.d-dev/hubmap-auth.conf b/nginx/conf.d-dev/hubmap-auth.conf
index a02205d..3014d53 100644
--- a/nginx/conf.d-dev/hubmap-auth.conf
+++ b/nginx/conf.d-dev/hubmap-auth.conf
@@ -70,8 +70,8 @@ server {
         }
         
         include uwsgi_params;
-        # Use "localhost" becuase the uWSGI server is also running on the same container
-        uwsgi_pass uwsgi://localhost:5000;
+        # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+        uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 }
 
@@ -100,8 +100,8 @@ server {
     # Pass reqeusts to the uWSGI server using the "uwsgi" protocol on port 5000
     location / { 
         include uwsgi_params;
-        # Use "localhost" becuase the uWSGI server is also running on the same container
-        uwsgi_pass uwsgi://localhost:5000;
+        # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+        uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 }
 
@@ -126,8 +126,8 @@ server {
     # Pass reqeusts to the uWSGI server using the "uwsgi" protocol on port 5000
     location / { 
         include uwsgi_params;
-        # Use "localhost" becuase the uWSGI server is also running on the same container
-        uwsgi_pass uwsgi://localhost:5000;
+        # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+        uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 
 }
\ No newline at end of file
diff --git a/nginx/conf.d-dev/ingest-ui.conf b/nginx/conf.d-dev/ingest-ui.conf
index 8e6607e..1893cd5 100644
--- a/nginx/conf.d-dev/ingest-ui.conf
+++ b/nginx/conf.d-dev/ingest-ui.conf
@@ -31,7 +31,8 @@ server {
         # If the file named `maintenance.on` exitis under the target directory
         # proxy all the requests to that port of this same container that serves the maintenance page
         if (-f /usr/share/nginx/html/ingest-ui-maintenance/maintenance.on) {
-            proxy_pass http://localhost:5555;
+            # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+            proxy_pass http://127.0.0.1:5555;
         }
         
         # ingest-ui nginx runs as non-root, using port 8080
diff --git a/nginx/conf.d-dev/portal-ui.conf b/nginx/conf.d-dev/portal-ui.conf
index edda67d..82a2d7f 100644
--- a/nginx/conf.d-dev/portal-ui.conf
+++ b/nginx/conf.d-dev/portal-ui.conf
@@ -31,7 +31,8 @@ server {
         # If the file named `maintenance.on` exitis under the target directory
         # proxy all the requests to that port of this same container that serves the maintenance page
         if (-f /usr/share/nginx/html/portal-ui-maintenance/maintenance.on) {
-            proxy_pass http://localhost:8888;
+            # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+            proxy_pass http://127.0.0.1:8888;
         }
 
         proxy_pass http://portal-ui;
diff --git a/nginx/conf.d-prod/hubmap-auth.conf b/nginx/conf.d-prod/hubmap-auth.conf
index 7c4848e..4d1d4f5 100644
--- a/nginx/conf.d-prod/hubmap-auth.conf
+++ b/nginx/conf.d-prod/hubmap-auth.conf
@@ -70,8 +70,8 @@ server {
         }
         
         include uwsgi_params;
-        # Use "localhost" becuase the uWSGI server is also running on the same container
-        uwsgi_pass uwsgi://localhost:5000;
+        # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+        uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 }
 
@@ -101,7 +101,7 @@ server {
     # Pass reqeusts to the uWSGI server using the "uwsgi" protocol on port 5000
     location / { 
         include uwsgi_params;
-        # Use "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+        # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
         uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 }
@@ -127,8 +127,8 @@ server {
     # Pass reqeusts to the uWSGI server using the "uwsgi" protocol on port 5000
     location / { 
         include uwsgi_params;
-        # Use "localhost" becuase the uWSGI server is also running on the same container
-        uwsgi_pass uwsgi://localhost:5000;
+        # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+        uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 
 }
diff --git a/nginx/conf.d-prod/ingest-ui.conf b/nginx/conf.d-prod/ingest-ui.conf
index 849a28e..96ffc52 100644
--- a/nginx/conf.d-prod/ingest-ui.conf
+++ b/nginx/conf.d-prod/ingest-ui.conf
@@ -31,7 +31,8 @@ server {
         # If the file named `maintenance.on` exitis under the target directory
         # proxy all the requests to that port of this same container that serves the maintenance page
         if (-f /usr/share/nginx/html/ingest-ui-maintenance/maintenance.on) {
-            proxy_pass http://localhost:5555;
+            # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+            proxy_pass http://127.0.0.1:5555;
         }
         
         # ingest-ui nginx runs as non-root, using port 8080
diff --git a/nginx/conf.d-prod/portal-ui.conf b/nginx/conf.d-prod/portal-ui.conf
index d5f1fe4..464c244 100644
--- a/nginx/conf.d-prod/portal-ui.conf
+++ b/nginx/conf.d-prod/portal-ui.conf
@@ -31,7 +31,8 @@ server {
         # If the file named `maintenance.on` exitis under the target directory
         # proxy all the requests to that port of this same container that serves the maintenance page
         if (-f /usr/share/nginx/html/portal-ui-maintenance/maintenance.on) {
-            proxy_pass http://localhost:8888;
+            # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+            proxy_pass http://127.0.0.1:8888;
         }
 
         proxy_pass http://portal-ui;
diff --git a/nginx/conf.d-stage/hubmap-auth.conf b/nginx/conf.d-stage/hubmap-auth.conf
index 4d568d1..48f10da 100644
--- a/nginx/conf.d-stage/hubmap-auth.conf
+++ b/nginx/conf.d-stage/hubmap-auth.conf
@@ -70,8 +70,8 @@ server {
         }
         
         include uwsgi_params;
-        # Use "localhost" becuase the uWSGI server is also running on the same container
-        uwsgi_pass uwsgi://localhost:5000;
+        # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+        uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 }
 
@@ -100,8 +100,8 @@ server {
     # Pass reqeusts to the uWSGI server using the "uwsgi" protocol on port 5000
     location / { 
         include uwsgi_params;
-        # Use "localhost" becuase the uWSGI server is also running on the same container
-        uwsgi_pass uwsgi://localhost:5000;
+        # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+        uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 }
 
@@ -126,8 +126,8 @@ server {
     # Pass reqeusts to the uWSGI server using the "uwsgi" protocol on port 5000
     location / { 
         include uwsgi_params;
-        # Use "localhost" becuase the uWSGI server is also running on the same container
-        uwsgi_pass uwsgi://localhost:5000;
+        # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+        uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 
 }
\ No newline at end of file
diff --git a/nginx/conf.d-stage/ingest-ui.conf b/nginx/conf.d-stage/ingest-ui.conf
index 16ec1e0..d549f87 100644
--- a/nginx/conf.d-stage/ingest-ui.conf
+++ b/nginx/conf.d-stage/ingest-ui.conf
@@ -31,7 +31,8 @@ server {
         # If the file named `maintenance.on` exitis under the target directory
         # proxy all the requests to that port of this same container that serves the maintenance page
         if (-f /usr/share/nginx/html/ingest-ui-maintenance/maintenance.on) {
-            proxy_pass http://localhost:5555;
+            # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+            proxy_pass http://127.0.0.1:5555;
         }
         
         # ingest-ui nginx runs as non-root, using port 8080
diff --git a/nginx/conf.d-stage/portal-ui.conf b/nginx/conf.d-stage/portal-ui.conf
index 9279d42..d547523 100644
--- a/nginx/conf.d-stage/portal-ui.conf
+++ b/nginx/conf.d-stage/portal-ui.conf
@@ -31,7 +31,8 @@ server {
         # If the file named `maintenance.on` exitis under the target directory
         # proxy all the requests to that port of this same container that serves the maintenance page
         if (-f /usr/share/nginx/html/portal-ui-maintenance/maintenance.on) {
-            proxy_pass http://localhost:8888;
+            # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+            proxy_pass http://127.0.0.1:8888;
         }
 
         proxy_pass http://portal-ui;
diff --git a/nginx/conf.d-test/hubmap-auth.conf b/nginx/conf.d-test/hubmap-auth.conf
index 96437e3..e460e9a 100644
--- a/nginx/conf.d-test/hubmap-auth.conf
+++ b/nginx/conf.d-test/hubmap-auth.conf
@@ -70,8 +70,8 @@ server {
         }
         
         include uwsgi_params;
-        # Use "localhost" becuase the uWSGI server is also running on the same container
-        uwsgi_pass uwsgi://localhost:5000;
+        # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+        uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 }
 
@@ -100,8 +100,8 @@ server {
     # Pass reqeusts to the uWSGI server using the "uwsgi" protocol on port 5000
     location / { 
         include uwsgi_params;
-        # Use "localhost" becuase the uWSGI server is also running on the same container
-        uwsgi_pass uwsgi://localhost:5000;
+        # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+        uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 }
 
@@ -127,7 +127,7 @@ server {
     location / { 
         include uwsgi_params;
         # Use "localhost" becuase the uWSGI server is also running on the same container
-        uwsgi_pass uwsgi://localhost:5000;
+        uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 
 }
\ No newline at end of file
diff --git a/nginx/conf.d-test/ingest-ui.conf b/nginx/conf.d-test/ingest-ui.conf
index 669ce60..f6eeba3 100644
--- a/nginx/conf.d-test/ingest-ui.conf
+++ b/nginx/conf.d-test/ingest-ui.conf
@@ -31,7 +31,8 @@ server {
         # If the file named `maintenance.on` exitis under the target directory
         # proxy all the requests to that port of this same container that serves the maintenance page
         if (-f /usr/share/nginx/html/ingest-ui-maintenance/maintenance.on) {
-            proxy_pass http://localhost:5555;
+            # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+            proxy_pass http://127.0.0.1:5555;
         }
         
         # ingest-ui nginx runs as non-root, using port 8080
diff --git a/nginx/conf.d-test/portal-ui.conf b/nginx/conf.d-test/portal-ui.conf
index 07c5217..247d200 100644
--- a/nginx/conf.d-test/portal-ui.conf
+++ b/nginx/conf.d-test/portal-ui.conf
@@ -31,7 +31,8 @@ server {
         # If the file named `maintenance.on` exitis under the target directory
         # proxy all the requests to that port of this same container that serves the maintenance page
         if (-f /usr/share/nginx/html/portal-ui-maintenance/maintenance.on) {
-            proxy_pass http://localhost:8888;
+            # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+            proxy_pass http://127.0.0.1:8888;
         }
 
         proxy_pass http://portal-ui;

From e67568e0f1002a9f571abfab23940643f5cfaf2e Mon Sep 17 00:00:00 2001
From: yuanzhou <yuanzhou19@gmail.com>
Date: Tue, 19 Jan 2021 11:28:29 -0500
Subject: [PATCH 5/7] Better log_format

---
 hubmap-auth/nginx.conf                  | 7 ++++++-
 nginx/conf.d-dev/hubmap-auth.conf       | 8 +++++---
 nginx/conf.d-localhost/hubmap-auth.conf | 7 ++++---
 nginx/conf.d-prod/hubmap-auth.conf      | 9 +++++----
 nginx/conf.d-stage/hubmap-auth.conf     | 8 +++++---
 nginx/conf.d-test/hubmap-auth.conf      | 8 +++++---
 6 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/hubmap-auth/nginx.conf b/hubmap-auth/nginx.conf
index ca91890..d7d327e 100644
--- a/hubmap-auth/nginx.conf
+++ b/hubmap-auth/nginx.conf
@@ -21,7 +21,12 @@ http {
                       '"$http_user_agent" "$http_x_forwarded_for"';
     
     # For better debugging upstream hubmap-auth service
-    log_format upstreamlog '[$time_local] $remote_addr - $remote_user - $server_name $host to: $upstream_addr: $request $status upstream_response_time $upstream_response_time msec $msec request_time $request_time';
+    # All time values are measured in seconds with millisecond resolution
+    log_format upstream_log '[$time_local] $remote_addr - $remote_user '
+                            'from $server_name $host to upstream: $upstream_addr "$request"'
+                            '$status $body_bytes_sent "$http_referer" '
+                            '$http_user_agent" "$http_x_forwarded_for" '
+                            'request_time=$request_time upstream_connect_time="$upstream_connect_time" upstream_header_time="$upstream_header_time" upstream_response_time="$upstream_response_time"';
 
     access_log  /var/log/nginx/access.log  main;
 
diff --git a/nginx/conf.d-dev/hubmap-auth.conf b/nginx/conf.d-dev/hubmap-auth.conf
index 3014d53..42b2847 100644
--- a/nginx/conf.d-dev/hubmap-auth.conf
+++ b/nginx/conf.d-dev/hubmap-auth.conf
@@ -32,7 +32,8 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    access_log /usr/src/app/log/nginx_access_gateway.log;
+    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
+    access_log /usr/src/app/log/nginx_access_gateway.log upstream_log;
     error_log /usr/src/app/log/nginx_error_gateway.log warn;
     
     location = /favicon.ico {
@@ -90,8 +91,9 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api.log;
-    error_log /usr/src/app/log/nginx_error_gateway_for_ingest-api.log warn;
+    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
+    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api_and_assets.log upstream_log;
+    error_log /usr/src/app/log/nginx_error_gateway_for_ingest-api_and_assets.log warn;
     
     location = /favicon.ico {
         alias /usr/share/nginx/html/favicon.ico;
diff --git a/nginx/conf.d-localhost/hubmap-auth.conf b/nginx/conf.d-localhost/hubmap-auth.conf
index d592544..8179817 100644
--- a/nginx/conf.d-localhost/hubmap-auth.conf
+++ b/nginx/conf.d-localhost/hubmap-auth.conf
@@ -16,7 +16,8 @@ server {
     root /usr/share/nginx/html;
 
     # Logging to the mounted volume for outside container access
-    access_log /usr/src/app/log/nginx_access_gateway.log;
+    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
+    access_log /usr/src/app/log/nginx_access_gateway.log upstream_log;
     error_log /usr/src/app/log/nginx_error_gateway.log warn;
     
     location = /favicon.ico {
@@ -54,8 +55,8 @@ server {
         }
         
         include uwsgi_params;
-        # Use "localhost" becuase the uwsgi server is also running on the same container
-        uwsgi_pass uwsgi://localhost:5000;
+        # Use IP v4 "127.0.0.1" instead of "localhost" to avoid 502 error caused by DNS failure
+        uwsgi_pass uwsgi://127.0.0.1:5000;
     }
 
 }
\ No newline at end of file
diff --git a/nginx/conf.d-prod/hubmap-auth.conf b/nginx/conf.d-prod/hubmap-auth.conf
index 4d1d4f5..e16d8e2 100644
--- a/nginx/conf.d-prod/hubmap-auth.conf
+++ b/nginx/conf.d-prod/hubmap-auth.conf
@@ -32,7 +32,8 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    access_log /usr/src/app/log/nginx_access_gateway.log;
+    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
+    access_log /usr/src/app/log/nginx_access_gateway.log upstream_log;
     error_log /usr/src/app/log/nginx_error_gateway.log warn;
     
     location = /favicon.ico {
@@ -90,9 +91,9 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    # Use the upstreamlog log_format defiend in the main nginx.conf for better debugging
-    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api.log upstreamlog;
-    error_log /usr/src/app/log/nginx_error_gateway_for_ingest-api.log warn;
+    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
+    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api_and_assets.log upstream_log;
+    error_log /usr/src/app/log/nginx_error_gateway_for_ingest-api_and_assets.log warn;
     
     location = /favicon.ico {
         alias /usr/share/nginx/html/favicon.ico;
diff --git a/nginx/conf.d-stage/hubmap-auth.conf b/nginx/conf.d-stage/hubmap-auth.conf
index 48f10da..fe98046 100644
--- a/nginx/conf.d-stage/hubmap-auth.conf
+++ b/nginx/conf.d-stage/hubmap-auth.conf
@@ -32,7 +32,8 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    access_log /usr/src/app/log/nginx_access_gateway.log;
+    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
+    access_log /usr/src/app/log/nginx_access_gateway.log upstream_log;
     error_log /usr/src/app/log/nginx_error_gateway.log warn;
     
     location = /favicon.ico {
@@ -90,8 +91,9 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api.log;
-    error_log /usr/src/app/log/nginx_error_gateway_for_ingest-api.log warn;
+    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
+    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api_and_assets.log upstream_log;
+    error_log /usr/src/app/log/nginx_error_gateway_for_ingest-api_and_assets.log warn;
     
     location = /favicon.ico {
         alias /usr/share/nginx/html/favicon.ico;
diff --git a/nginx/conf.d-test/hubmap-auth.conf b/nginx/conf.d-test/hubmap-auth.conf
index e460e9a..f19b70a 100644
--- a/nginx/conf.d-test/hubmap-auth.conf
+++ b/nginx/conf.d-test/hubmap-auth.conf
@@ -32,7 +32,8 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    access_log /usr/src/app/log/nginx_access_gateway.log;
+    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
+    access_log /usr/src/app/log/nginx_access_gateway.log upstream_log;
     error_log /usr/src/app/log/nginx_error_gateway.log warn;
     
     location = /favicon.ico {
@@ -90,8 +91,9 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api.log;
-    error_log /usr/src/app/log/nginx_error_gateway_for_ingest-api.log warn;
+    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
+    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api_and_assets.log upstream_log;
+    error_log /usr/src/app/log/nginx_error_gateway_for_ingest-api_and_assets.log warn;
     
     location = /favicon.ico {
         alias /usr/share/nginx/html/favicon.ico;

From 30a6352d00f19111a2ef9978df9265ce6a251b1a Mon Sep 17 00:00:00 2001
From: yuanzhou <yuanzhou19@gmail.com>
Date: Tue, 19 Jan 2021 12:17:40 -0500
Subject: [PATCH 6/7] Tweaks to nginx

---
 hubmap-auth/nginx.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hubmap-auth/nginx.conf b/hubmap-auth/nginx.conf
index d7d327e..3a76c83 100644
--- a/hubmap-auth/nginx.conf
+++ b/hubmap-auth/nginx.conf
@@ -23,10 +23,10 @@ http {
     # For better debugging upstream hubmap-auth service
     # All time values are measured in seconds with millisecond resolution
     log_format upstream_log '[$time_local] $remote_addr - $remote_user '
-                            'from $server_name $host to upstream: $upstream_addr "$request"'
-                            '$status $body_bytes_sent "$http_referer" '
+                            '$host upstream: $upstream_addr '
+                            '"$request" $status $body_bytes_sent "$http_referer" '
                             '$http_user_agent" "$http_x_forwarded_for" '
-                            'request_time=$request_time upstream_connect_time="$upstream_connect_time" upstream_header_time="$upstream_header_time" upstream_response_time="$upstream_response_time"';
+                            'request_time=$request_time upstream_connect_time=$upstream_connect_time upstream_header_time=$upstream_header_time upstream_response_time=$upstream_response_time';
 
     access_log  /var/log/nginx/access.log  main;
 

From e037fbfcf8f9bb8bf03389e668451f6b38e23d05 Mon Sep 17 00:00:00 2001
From: "Zhou (Joe) Yuan" <yuanzhou19@gmail.com>
Date: Tue, 19 Jan 2021 12:26:09 -0500
Subject: [PATCH 7/7] Update VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 8decb92..f263cd1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.5
+1.8.6