From 489016782c7548c6279d4e0560105f4bf3361f77 Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Tue, 23 Jul 2024 14:48:59 -0400 Subject: [PATCH] progress --- release_version.txt | 2 +- scripts/alpaca_hist_md/alpaca_md_day.sh | 33 ++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/release_version.txt b/release_version.txt index 21e8796..ee90284 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.0.3 +1.0.4 diff --git a/scripts/alpaca_hist_md/alpaca_md_day.sh b/scripts/alpaca_hist_md/alpaca_md_day.sh index 79dce0c..ab0599d 100755 --- a/scripts/alpaca_hist_md/alpaca_md_day.sh +++ b/scripts/alpaca_hist_md/alpaca_md_day.sh @@ -3,19 +3,44 @@ date_to_load=${1} DockerRegistry=cloud21.cvtt.vpn:5500 -DockerImage=${DockerRegistry}/alpaca_md_day:latest +DockerImage=${DockerRegistry}/alpaca_md_day #:latest LastDayFile=/home/cvtt/prod/logs/last_alpaca_hist_day +ContainerName=alpaca_md_day + +is_container_running() { + local container_name=$1 + + if [ "$(docker ps --filter "name=^/${container_name}$" --filter "status=running" -q)" ]; then + return 0 # true + else + return 1 # false + fi +} + if [ -z ${date_to_load} ] ; then - echo "Yesterday data. Historical container will be killed" - docker kill alpaca_md_day + echo "Yesterday data has priority. Running historical container will be killed" + docker kill ${ContainerName} else + echo "Historical run ${date_to_load}" + if is_container_running "$ContainerName"; then + echo "Container ${ContainerName} is already running." + exit 3 + fi if [ "${date_to_load}" == "next" ] ; then + if [ ! -e ${LastDayFile} ]; then + mv ${LastDayFile}.prev ${LastDayFile} + if [ ! -e ${LastDayFile} ]; then + echo "file ${LastDayFile} does not exist" + exit 2 + fi + fi last_date=$(cat ${LastDayFile}) if [ -z ${last_date} ] ; then echo "No last date_to_load in ${LastDayFile}" exit 1 fi + mv ${LastDayFile} ${LastDayFile}.prev date_to_load=$(date -d "${last_date} - 1 day" "+%Y-%m-%d") fi echo "Historical Data for ${date_to_load}" @@ -23,7 +48,7 @@ fi Cmd="docker run" Cmd="${Cmd} --network=host" -Cmd="${Cmd} --name=alpaca_md_day" +Cmd="${Cmd} --name=${ContainerName}" Cmd="${Cmd} --rm" Cmd="${Cmd} ${DockerImage}" Cmd="${Cmd} ${date_to_load}"