From d5b1006d2a42618e3a17ac1bd3aea9b90bf48a63 Mon Sep 17 00:00:00 2001 From: Pascal Date: Thu, 4 Mar 2021 13:04:21 -0500 Subject: [PATCH] [fix] cleanup server pid file on ungraceful shutdown in container --- docker/files/entrypoint.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docker/files/entrypoint.sh b/docker/files/entrypoint.sh index 104a7e5..adf5cfa 100755 --- a/docker/files/entrypoint.sh +++ b/docker/files/entrypoint.sh @@ -6,6 +6,7 @@ prefix_file="${API_PREFIX_FILE:-/app/data/api_prefix}" db_file="${RAILS_DB_PATH:-/app/data/rynDNS.sqlite3}" default_admin_file="${API_DEFAULT_KEY_FILE:-/app/data/api_default_admin}" +server_pid_file="${RAILS_PID_FILE:-/app/tmp/pids/server.pid}" rails_bin="${RAILS_BINARY:-/app/bin/rails}" demo_cycle="${RAILS_DEMO_RESET:-60m}" demo_prefix="zW3If4s5" @@ -50,6 +51,15 @@ function random_sting() echo -n "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w "${1:-32}" | head -n 1)" } +function cleanup() +{ + if [ -f $server_pid_file ]; then + log WAR cleanup last server shutdown may have not been graceful + log cleanup deleting old server pid file + rm $server_pid_file + fi +} + function get_prefix_file() { if [ -f "$prefix_file" ]; then @@ -113,6 +123,7 @@ function db_setup() function main() { + cleanup set_api_prefix log main prefix: $RAILS_API_KEY_PREFIX db_setup @@ -122,4 +133,4 @@ function main() exec $rails_bin s } -main "$@" \ No newline at end of file +main "$@"