darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-07-14 18:30:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "AUTO-413: Use an internal app for statsd preview"

Browse Source
This commit is contained in:
Leo Hemsted
2019-05-22 17:06:43 +01:00
committed by GitHub
parent a0ec27acfb
commit 21071b2908
4 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/run_app_paas.sh
View File

@@ -69,10 +69,20 @@ function start_aws_logs_agent {
echo "AWS logs agent pid: ${AWSLOGS_AGENT_PID}"
}
function start_statsd_exporter {
echo "Starting statsd exporter..."
exec ./scripts/statsd_exporter --web.listen-address=":${PORT}" --statsd.listen-udp=":8125" --statsd.mapping-config=statsd_mapping.yml &
STATSD_EXPORTER_PID=$!
echo "Statsd exporter pid: ${STATSD_EXPORTER_PID}"
}
function run {
while true; do
kill -0 ${APP_PID} 2&>/dev/null || break
kill -0 ${AWSLOGS_AGENT_PID} 2&>/dev/null || start_aws_logs_agent
if [ "${STATSD_HOST}" == "localhost" ]; then
kill -0 ${STATSD_EXPORTER_PID} 2&>/dev/null || start_statsd_exporter
fi
sleep 1
done
}
@@ -84,6 +94,9 @@ check_params
trap "on_exit" EXIT
configure_aws_logs
if [ "${STATSD_HOST}" == "localhost" ]; then
start_statsd_exporter
fi
# The application has to start first!
start_application "$@"

14
scripts/run_multi_worker_app_paas.sh
View File

@@ -104,6 +104,13 @@ function start_logs_tail {
echo "tail pid: ${LOGS_TAIL_PID}"
}
function start_statsd_exporter {
echo "Starting statsd exporter..."
exec ./scripts/statsd_exporter --web.listen-address=":${PORT}" --statsd.listen-udp=":8125" --statsd.mapping-config=statsd_mapping.yml &
STATSD_EXPORTER_PID=$!
echo "Statsd exporter pid: ${STATSD_EXPORTER_PID}"
}
function ensure_celery_is_running {
if [ "${APP_PIDS}" = "" ]; then
echo "There are no celery processes running, this container is bad"
@@ -119,6 +126,7 @@ function ensure_celery_is_running {
echo "Killing awslogs_agent and tail"
kill -9 ${AWSLOGS_AGENT_PID}
kill -9 ${LOGS_TAIL_PID}
kill -9 ${STATSD_EXPORTER_PID}
exit 1
fi
@@ -135,6 +143,9 @@ function run {
done
kill -0 ${AWSLOGS_AGENT_PID} 2&>/dev/null || start_aws_logs_agent
kill -0 ${LOGS_TAIL_PID} 2&>/dev/null || start_logs_tail
if [ "${STATSD_HOST}" == "localhost" ]; then
kill -0 ${STATSD_EXPORTER_PID} 2&>/dev/null || start_statsd_exporter
fi
sleep 1
done
}
@@ -146,6 +157,9 @@ check_params
trap "on_exit" EXIT
configure_aws_logs
if [ "${STATSD_HOST}" == "localhost" ]; then
start_statsd_exporter
fi
# The application has to start first!
start_application "$@"