From 974b59a5b7e8c00740484cc55dd1576276f67e6f Mon Sep 17 00:00:00 2001 From: bandesz Date: Tue, 21 Mar 2017 14:43:56 +0000 Subject: [PATCH 1/2] Add 'production' alias for live environment --- app/config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config.py b/app/config.py index 7019b7a00..a39a3b956 100644 --- a/app/config.py +++ b/app/config.py @@ -262,6 +262,7 @@ configs = { 'development': Development, 'test': Test, 'live': Live, + 'production': Live, 'staging': Staging, 'preview': Preview, 'sandbox': Sandbox From bacce90ac29ff70e5ae55f506f2d3932e6556279 Mon Sep 17 00:00:00 2001 From: bandesz Date: Tue, 21 Mar 2017 15:03:03 +0000 Subject: [PATCH 2/2] PaaS run script: redirect stderr to stdout --- scripts/run_app_paas.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/run_app_paas.sh b/scripts/run_app_paas.sh index f00ed5a70..2ac52c388 100755 --- a/scripts/run_app_paas.sh +++ b/scripts/run_app_paas.sh @@ -25,15 +25,10 @@ function configure_aws_logs { [general] state_file = /home/vcap/logs/awslogs-state -[/home/vcap/logs/app-stdout.log] -file = /home/vcap/logs/app-stdout.log* +[/home/vcap/logs/app.log] +file = /home/vcap/logs/app.log* log_group_name = paas-${CW_APP_NAME}-application -log_stream_name = {hostname}-stdout - -[/home/vcap/logs/app-stderr.log] -file = /home/vcap/logs/app-stderr.log* -log_group_name = paas-${CW_APP_NAME}-application -log_stream_name = {hostname}-stderr +log_stream_name = {hostname} EOF } @@ -58,7 +53,7 @@ function on_exit { } function start_appplication { - exec "$@" 2>/home/vcap/logs/app-stderr.log | while read line; do echo $line; echo $line >> /home/vcap/logs/app-stdout.log.`date +%Y-%m-%d`; done & + exec "$@" 2>&1 | while read line; do echo $line; echo $line >> /home/vcap/logs/app.log.`date +%Y-%m-%d`; done & LOGGER_PID=$! APP_PID=`jobs -p` echo "Logger process pid: ${LOGGER_PID}"