fix

cronjobs/cvtt/cloud16.cron

@@ -1,10 +0,0 @@
-0 6 * * * /usr/bin/supervisorctl -c /home/cvtt/prod/config/supervisor/supervisord.conf restart config_service 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).config_service.restart.log
-#
-#
-#---------------------- Utils
-0 5 * * * /home/cvtt/prod/utils/config_svc_backup.sh 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).config_svc_backup.log
-0 6 * * * /home/cvtt/prod/utils/archive_logs.sh /home/cvtt/prod/logs 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).archive_logs.log
-10 1 * * * /home/cvtt/prod/utils/move_archives.sh  2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).move_archives.log
-
-#
-#---------------------- T E S T

cronjobs/cvtt/cloud17.cron

@@ -1,11 +0,0 @@
-0 6 * * * /usr/bin/supervisorctl -c /home/cvtt/prod/config/supervisor/supervisord.conf restart all 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).bnbspot_md_recorder.restart.log
-#
-#10 6 * * * /usr/bin/supervisorctl -c /home/cvtt/prod/config/supervisor/supervisord.conf restart executor 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).executor_app.restart.log
-#
-#---------------------- Utils
-0 6 * * * /home/cvtt/prod/utils/archive_logs.sh /home/cvtt/prod/logs 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).cronjob_log_archive.log
-10 1 * * * /home/cvtt/prod/utils/move_archives.sh cloud17 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).move_archives.log
-#
-# ----------------- #  TEST
-#
-# ----------------- #  TEST

cronjobs/cvtt/cloudstore.cron

@@ -1,8 +0,0 @@
-20 5 * * SAT /home/cvtt/prod/run/load_histdata.sh 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  >> /home/cvtt/prod/logs/$(date +\
-20 6 * * SAT /home/cvtt/prod/run/prune_eqt_histdata.sh 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  >> /home/cvtt/prod/logs/$(da
-#
-0 6 * * SUN /home/cvtt/prod/run/archive_logs.sh /home/cvtt/prod/logs 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/p
-#
-# T E S T
-#----------------------------------------------------------------------
-#----------------------------------------------------------------------

cronjobs/cvtt/cryptoval3.cron

@@ -1,11 +0,0 @@
-#
-#---------------------- Market Data
-0 6 * * * /home/cvtt/prod/run/archive_yesterday_md.sh  coinbase,bnbspot,bnbfut 2>&1  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).archive_yestd_md.log
-#---------------------- Utils
-0 7 * * * /home/cvtt/prod/utils/backup_md_archive.sh  2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).backup_md_archive.log
-#
-30 7 * * * /home/cvtt/prod/utils/archive_logs.sh /home/cvtt/prod/logs 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]'  > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).cronjob_log_archive.log
-#
-# ----------------- #  TEST
-#
-# ----------------- #  TEST

cronjobs/save_cronjobs.sh

@@ -0,0 +1,70 @@
+#!/bin/sh
+
+usage() {
+    echo "Usage: ${0} <local_root_dir>"
+    exit 1
+}
+
+get_user_hosts() {
+    local User=${1}
+    local Domain=${2}
+
+    Cmd="curl -s http://cloud23.cvtt.vpn:6789/admin/cvtt_hosts"
+    Cmd="${Cmd} | ${HOME}/bin/hjson -j"
+    Cmd="${Cmd} | jq -r"
+    Cmd="${Cmd} --arg domain \"${Domain}\""
+    Cmd="${Cmd} --arg usr \"${User}\""
+    Cmd="${Cmd} '.[\$domain] | to_entries[] | select(.value.users[] | contains(\$usr)) | .key'"
+    # echo $Cmd  ### - FOR DEBUG ONLY
+    eval ${Cmd}
+}
+
+Domain=cvtt.vpn
+echo "Started ${0} ${*} ..."
+
+RootDir=${1}
+
+if [ ! -d "${RootDir}" ]; then
+    usage
+fi
+
+cd ${RootDir}
+Cmd="git pull"
+echo ${Cmd} && eval ${Cmd}
+
+for User in cvtt oleg
+do
+    echo "User=$User"
+    Cmd="mkdir -p ${RootDir}/${User}"
+    echo ${Cmd} && eval ${Cmd}
+
+    hosts=$(get_user_hosts ${User} ${Domain})
+    echo ${hosts}
+
+    for host in ${hosts}
+    do
+        echo "===================="
+        echo "${host}:${User}"
+        Cmd="ssh ${User}@${host}.${Domain} 'crontab -l' | tee ${RootDir}/${User}/${host}.cron"
+        echo ${Cmd} && eval ${Cmd}
+    done
+done
+
+cd ${RootDir}
+
+Cmd="find -type f -empty -delete -print"
+echo ${Cmd} && eval ${Cmd}
+
+Cmd="find -type d -empty -delete -print"
+echo ${Cmd} && eval ${Cmd}
+
+Cmd="git add ."
+echo ${Cmd} && eval ${Cmd}
+
+Cmd="git commit -a -m '$(date)'"
+echo ${Cmd} && eval ${Cmd}
+
+Cmd="git pushall"
+echo ${Cmd} && eval ${Cmd}
+
+echo "Done ${0} ${*}"

docker/md_recorder.sh

@@ -11,7 +11,7 @@ is_valid() {
   local job=$1
   for valid_job in "${ValidJobs[@]}";
   do
-    echo "job=$job valid_job=$valid_job"
+    # echo "job=$job valid_job=$valid_job"
     if [[ "${job}" == "${valid_job}" ]]; then
       return 0
     fi
@@ -19,22 +19,40 @@ is_valid() {
   return 1
 }
 
+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
+}
+
 
 job=${1}
 if  ! is_valid "${job}"; then
     usage
 fi
 
+ContainerName="md_recorder.${job}"
+
+if is_container_running "$ContainerName"; then
+    echo "Container ${ContainerName} is already running. Aborted."
+    exit
+fi
+
+
 Cmd="docker run"
 Cmd="${Cmd} -d"
 Cmd="${Cmd} --rm"
 Cmd="${Cmd} --network=host"
 Cmd="${Cmd} --pull=always"
-Cmd="${Cmd} --name=md_recorder.${job}"
+Cmd="${Cmd} --name=${ContainerName}"
 Cmd="${Cmd} -v /home/cvtt/prod/data:/app/data"
 Cmd="${Cmd} -v /home/cvtt/prod/logs:/logs"
 Cmd="${Cmd} cloud21.cvtt.vpn:5500/md_recorder:latest"
 Cmd="${Cmd} ${job}"
 
 echo ${Cmd}
-# eval ${Cmd}
+eval ${Cmd}

docker/md_recorder_monitor.sh

@@ -17,6 +17,18 @@ is_valid() {
   return 1
 }
 
+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
+}
+
+
+
 
 Instance=${1}
 if ! is_valid "${Instance}"; then
@@ -28,16 +40,21 @@ if [ "${2}" != "" ]; then
     AdminPort=${2}
 fi
 
+ContainerName="md_recorder_monitor.${Instance}"
+
+if is_container_running "$ContainerName"; then
+    echo "Container ${ContainerName} is already running. Aborted."
+    exit
+fi
 
 Cmd="docker run"
 Cmd="${Cmd} -d"
 Cmd="${Cmd} --rm"
 Cmd="${Cmd} --network=host"
 Cmd="${Cmd} --pull=always"
-Cmd="${Cmd} --name=md_recorder_monitor.${job}"
-Cmd="${Cmd} -p ${AdminPort}:${AdminPort}"
+Cmd="${Cmd} --name=${ContainerName}"
 Cmd="${Cmd} -v /home/cvtt/prod/logs:/logs"
-Cmd="${Cmd} cloud21.cvtt.vpn:5500/md_recorder:latest"
+Cmd="${Cmd} cloud21.cvtt.vpn:5500/md_recorder_monitor:latest"
 Cmd="${Cmd} ${Instance} ${AdminPort}"
 
 echo ${Cmd}

release_version.txt

@@ -1 +1 @@
-1.1.9
+1.3.3