Hook up nginx settings for defining error log level. Default to warn.

We previously had this configuration item defined, but it wasn't actually being used in the nginx config.
NREL · Jun 30, 2018 · 2b0c8ac · 2b0c8ac
1 parent d901910
commit 2b0c8ac
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/config/default.yml b/config/default.yml
@@ -18,7 +18,7 @@ listen:
 nginx:
   workers: auto
   worker_connections: 8192
-  error_log_level: notice
+  error_log_level: warn
   access_log_filename: access.log
   access_log_options: buffer=256k flush=10s
   proxy_connect_timeout: 60

diff --git a/config/test.yml b/config/test.yml
@@ -12,7 +12,10 @@ nginx:
   # hard-coded for test purposes so we have a more stable baseline and ensure
   # our tests always run with multiple workers.
   workers: 2
+  # Disable log output buffering for immediate output in tests.
   access_log_options:
+  # Increase error log verbosity in tests.
+  error_log_level: notice
   proxy_connect_timeout: 10
   proxy_read_timeout: 10
   proxy_send_timeout: 10

diff --git a/templates/etc/nginx/auto-ssl.conf.mustache b/templates/etc/nginx/auto-ssl.conf.mustache
@@ -20,7 +20,7 @@ events {
   worker_connections {{auto_ssl.worker_connections}};
 }
 
-error_log stderr;
+error_log stderr {{nginx.error_log_level}};
 
 pcre_jit on;
 

diff --git a/templates/etc/nginx/router.conf.mustache b/templates/etc/nginx/router.conf.mustache
@@ -20,7 +20,7 @@ events {
   worker_connections {{nginx.worker_connections}};
 }
 
-error_log stderr;
+error_log stderr {{nginx.error_log_level}};
 
 env API_UMBRELLA_SRC_ROOT;
 env API_UMBRELLA_RUNTIME_CONFIG;