Skip to content

Commit 97ce414

Browse files
committed
Merge pull request #3574 from Blystad/router_error_log_level
feat(router): customize error_log level via etcd
2 parents 4f50645 + b19e61a commit 97ce414

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

docs/customizing_deis/router_settings.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ setting description
5050
/deis/router/enforceHTTPS redirect all HTTP traffic to HTTPS (default: false)
5151
/deis/router/firewall/enabled nginx naxsi firewall enabled (default: false)
5252
/deis/router/firewall/errorCode nginx default firewall error code (default: 400)
53+
/deis/router/errorLogLevel nginx error_log level (default: error) Valid options: debug, info, notice, warn, error, crit, alert, emerg
5354
/deis/router/gzip nginx gzip setting (default: on)
5455
/deis/router/gzipCompLevel nginx gzipCompLevel setting (default: 5)
5556
/deis/router/gzipDisable nginx gzipDisable setting (default: "msie6")

router/image/templates/nginx.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ http {
5151

5252
# send logs to STDOUT so they can be seen using 'docker logs'
5353
access_log /opt/nginx/logs/access.log upstreaminfo;
54-
error_log /opt/nginx/logs/error.log;
54+
error_log /opt/nginx/logs/error.log {{ or (.deis_router_errorLogLevel) "error" }};
5555

5656
map $http_upgrade $connection_upgrade {
5757
default upgrade;

0 commit comments

Comments
 (0)