fix

release_version.txt

@@ -1 +1 @@
-1.0.3
+1.1.2

scripts/alpaca_hist_md/alpaca_md_day.sh

@@ -3,27 +3,78 @@
 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"
+    echo "Yesterday data has priority. Running historical container will be stopped"
-    docker kill alpaca_md_day
+    Cmd="docker stop ${ContainerName}"
+    echo ${Cmd} && eval ${Cmd}
+    Cmd="docker kill ${ContainerName}"
+    echo ${Cmd} && eval ${Cmd}
+    Cmd="docker rm -f ${ContainerName}"
+    echo ${Cmd} && eval ${Cmd}
+
+    Cmd="docker ps"
+    echo ${Cmd} && eval ${Cmd}
+
+    if is_container_running "$ContainerName"; then
+        echo "Container ${ContainerName} is still running."
+        exit 3
+    fi
 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
-        last_date=$(cat ${LastDayFile})
+        if [ ! -e ${LastDayFile} ]; then
-        if [ -z ${last_date} ] ; then
+            echo "File ${LastDayFile} does not exist. Will try to use prev file."
+            if [ ! -e ${LastDayFile}.prev ]; then
+                echo "File ${LastDayFile}.prev does not exist. Aborted."
+                exit 2
+            fi
+            mv ${LastDayFile}.prev ${LastDayFile}
+        fi
+        last_date=$(cat ${LastDayFile} | xargs)
+        if [ -z "${last_date}" ] ; then
+            echo "File ${LastDayFile} returned an empty last day. Will try to use prev file."
+            if [ ! -e ${LastDayFile}.prev ]; then
+                echo "File ${LastDayFile}.prev does not exist. Aborted."
+                exit 2
+            fi
+            mv ${LastDayFile}.prev ${LastDayFile}
+            last_date=$(cat ${LastDayFile} | xargs)
+            if [ -z "${last_date}" ] ; then
+                echo "Unable to obtain last_date. Aborted"
+                exit 3
+            fi
             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}"
 fi
 
 Cmd="docker run"
+Cmd="${Cmd} --pull=always"
 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}"
@@ -35,7 +86,9 @@ if [ "$?" != "0" ] ; then
     exit 1 # if killed we do not save last day
 fi
 
-if [ -n ${date_to_load}]; then
+# truncate to avoid false positive
+date_to_load=$(echo "${date_to_load}" | xargs)
+if [ -n "${date_to_load}" ]; then
     echo "Saving date_to_load to ${LastDayFile}"
     echo ${date_to_load} >  ${LastDayFile}
 fi

scripts/build_release.sh

@@ -7,25 +7,46 @@ git_repo_arr[cvttpy]=git@cloud21.cvtt.vpn:/opt/store/git/cvttpy.git
 git_repo_arr[ops]=git@cloud21.cvtt.vpn:/opt/store/git/ops.git
 git_repo_arr[research]=git@cloud21.cvtt.vpn:/opt/store/git/research.git
 
-default_project=cvttpy
-default_branch=master
-
-
 dist_root=/home/cvttdist/software/cvtt2
 dist_user=cvttdist
 dist_host="cloud21.cvtt.vpn"
 dist_ssh_port="22"
 
 dist_locations="cloud21.cvtt.vpn:22 homestore.cvtt.vpn:22"
+# ---------------- Settings
 
-interactive=Y
+# ---------------- cmdline
-
+prj=
-# cmdline
+brnch=master
-prj=${1:-${default_project}}
-brnch=${2:-${default_branch}}
-if [ "${3}" == "D" ]; then
 interactive=N
-fi
+
+usage() {
+  echo "Usage: $0 -p <project> [-b <branch (master)> -i (interactive)"
+  exit 1
+}
+
+while getopts ":p:b:i" opt; do
+  case ${opt} in
+    p )
+      prj=$OPTARG
+      ;;
+    b )
+      brnch=$OPTARG
+      ;;
+    i )
+      interactive=Y
+      ;;
+    \? )
+      echo "Invalid option: -$OPTARG" >&2
+      usage
+      ;;
+    : )
+      echo "Option -$OPTARG requires an argument." >&2
+      usage
+      ;;
+  esac
+done
+# ---------------- cmdline
 
 function confirm {
     if [ "${interactive}" == "Y" ]; then

scripts/crypto_hist_md/crypto_md_day.sh

@@ -11,6 +11,7 @@ if [ -z ${date} ] ; then
 fi
 
 Cmd="docker run"
+Cmd="${Cmd} --pull=always"
 Cmd="${Cmd} --network=host"
 Cmd="${Cmd} --name=crypto_md_day.${host}.${date}"
 Cmd="${Cmd} --rm"