fix

VERSION

@@ -1 +1 @@
-2.1.3,remove cvttdata
+2.2.6

docker/market_data/hist/crypto_md_day.sh

@@ -1,44 +0,0 @@
-#!/bin/bash
-usage() {
-    echo "Usage: ${0} <docker_image_tag> <host> [<date>]"
-    exit 1
-}
-
-# ------- Settings
-DockerRegistry=cloud21.cvtt.vpn:5500
-# ------- Settings
-
-ImageTag=${1}
-host=${2}
-date=${3}
-
-if [ -z ${ImageTag} ] ; then
-    usage
-fi
-
-if [ -z ${host} ] ; then
-    usage
-fi
-
-if [ -z ${date} ] ; then
-    date=$(date -d "yesterday" +%Y%m%d)
-fi
-
-DockerImage=${DockerRegistry}/crypto_md_day:${ImageTag}
-
-
-Cmd="docker run"
-Cmd+=" --pull=always"
-Cmd+=" --network=host"
-Cmd+=" --name=crypto_md_day.${host}.${date}"
-Cmd+=" --rm"
-Cmd+=" --volume=${HOME}/.creds:/.creds"
-Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
-Cmd+=" ${DockerImage}"
-Cmd+=" -h ${host}"
-Cmd+=" -d ${date}"
-# Cmd+=" -s coinbase,bnbspot,bnbfut"
-Cmd+=" -s coinbase,bnbspot"
-
-echo $Cmd
-eval $Cmd

docker/market_data/hist/load_alpaca_hbar.sh

@@ -1,113 +0,0 @@
-#!/bin/bash
-
-usage() {
-  echo "Usage: $0  -N <num_symbols> [-L <LogDir>] [-d <YYYYMMDD Date>] [-t <docker_image_tag>]"
-  exit 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
-}
-
-export CalendarURL=https://trading-calendar.cvtt.net/api/v1/markets/hours?mic=XNYS
-
-is_business_day() {
-    dt=${1}
-
-    open_time=$(curl -s "${CalendarURL}&start=${dt}&end=${dt}" | jq '.[] | .open_time')
-    if [ -n  "${open_time}" ]; then
-        return 0
-    else
-        return 1
-    fi
-
-}
-export -f is_business_day
-
-get_prev_business_day() {
-    Start=${1}
-    while true; do
-        if is_business_day ${Start}; then
-            break
-        fi
-        echo "${Start} is not business day in US" >&2
-        Start=$(date -d "${Start} - 1 day" "+%Y-%m-%d")
-    done
-    echo ${Start}
-}
-export -f get_prev_business_day
-
-# ----- Settings
-DockerRegistry=cloud21.cvtt.vpn:5500
-ContainerName=alpaca_hbar
-LogDir=/home/cvtt/prod/logs
-ImageTag=0.1.7
-# ----- Settings
-
-while getopts ":d:N:L:t:" opt; do
-  case ${opt} in
-    d )
-      date_to_load=$OPTARG
-      ;;
-    N )
-      NumSymbols=$OPTARG
-      ;;
-    L )
-      LogDir=$OPTARG
-      ;;
-    t )
-      ImageTag=$OPTARG
-      ;;
-    \? )
-      echo "Invalid option: -$OPTARG" >&2
-      usage
-      ;;
-    : )
-      echo "Option -$OPTARG requires an argument." >&2
-      usage
-      ;;
-  esac
-done
-
-DockerImage=${DockerRegistry}/alpaca_hbar:${ImageTag} #:latest
-
-
-if is_container_running "$ContainerName"; then
-    echo "Container ${ContainerName} is already running."
-    exit 3
-fi
-
-if [ -z "${date_to_load}" ]; then
-    echo "date_to_load is empty"
-    date_to_load=$(get_prev_business_day $(date  -d "yesterday" '+%Y-%m-%d'))
-    echo "Historical Data for ${date_to_load}"
-fi
-
-echo "date_to_load=${date_to_load}"
-
-Cmd="docker run"
-Cmd+=" --pull=always"
-Cmd+=" --network=host"
-Cmd+=" --name=${ContainerName}"
-Cmd+=" --rm"
-Cmd+=" --volume=${LogDir}:/logs"
-Cmd+=" --volume=${HOME}/.creds:/.creds"
-Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
-Cmd+=" ${DockerImage}"
-Cmd+=" -d ${date_to_load}"
-if [ -n "${NumSymbols}" ]; then
-    Cmd+=" -N ${NumSymbols}"
-fi
-
-echo $Cmd
-eval $Cmd
-
-if [ "$?" != "0" ] ; then
-    exit 1 # if killed we do not save last day
-fi

docker/market_data/hist/load_alpaca_qat.sh

@@ -1,115 +0,0 @@
-#!/bin/bash
-
-usage() {
-  echo "Usage: $0  -S <symbols> [-L <LogDir>] [-d <YYYYMMDD Date>] [-t <docker_image_tag>]"
-  exit 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
-}
-
-export CalendarURL=https://trading-calendar.cvtt.net/api/v1/markets/hours?mic=XNYS
-
-is_business_day() {
-    dt=${1}
-
-    open_time=$(curl -s "${CalendarURL}&start=${dt}&end=${dt}" | jq '.[] | .open_time')
-    if [ -n  "${open_time}" ]; then
-        return 0
-    else
-        return 1
-    fi
-
-}
-export -f is_business_day
-
-get_prev_business_day() {
-    Start=${1}
-    while true; do
-        if is_business_day ${Start}; then
-            break
-        fi
-        echo "${Start} is not business day in US" >&2
-        Start=$(date -d "${Start} - 1 day" "+%Y-%m-%d")
-    done
-    echo ${Start}
-}
-export -f get_prev_business_day
-
-# ----- Settings
-DockerRegistry=cloud21.cvtt.vpn:5500
-ContainerName=alpaca_qat
-LogDir=/home/cvtt/prod/logs
-ImageTag=0.1.7
-# ----- Settings
-
-while getopts ":d:S:L:t:" opt; do
-  case ${opt} in
-    d )
-      date_to_load=$OPTARG
-      ;;
-    S )
-      Symbols=$OPTARG
-      ;;
-    L )
-      LogDir=$OPTARG
-      ;;
-    t )
-      ImageTag=$OPTARG
-      ;;
-    \? )
-      echo "Invalid option: -$OPTARG" >&2
-      usage
-      ;;
-    : )
-      echo "Option -$OPTARG requires an argument." >&2
-      usage
-      ;;
-  esac
-done
-
-if [ -z ${Symbols}  ] ; then
-    echo "symbols are not specified"
-    usage
-fi
-
-if is_container_running "$ContainerName"; then
-    echo "Container ${ContainerName} is already running."
-    exit 3
-fi
-
-DockerImage=${DockerRegistry}/alpaca_qat:${ImageTag} #:latest
-
-if [ -z "${date_to_load}" ]; then
-    echo "date_to_load is empty"
-    date_to_load=$(get_prev_business_day $(date  -d "yesterday" '+%Y-%m-%d'))
-    echo "Historical Data for ${date_to_load}"
-fi
-
-echo "date_to_load=${date_to_load}"
-
-Cmd="docker run"
-Cmd+=" --pull=always"
-Cmd+=" --network=host"
-Cmd+=" --name=${ContainerName}"
-Cmd+=" --rm"
-Cmd+=" --volume=${LogDir}:/logs"
-Cmd+=" --volume=${HOME}/.creds:/.creds"
-Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
-Cmd+=" ${DockerImage}"
-Cmd+=" -d ${date_to_load}"
-Cmd+=" -S ${Symbols}"
-
-echo $Cmd
-eval $Cmd
-
-if [ "$?" != "0" ] ; then
-    exit 1 # if killed we do not save last day
-fi

research/load_crypto_md.sh

@@ -3,7 +3,7 @@
 usage() {
   echo -n "Usage: $0 [-h <host (hs01*/cloud21)>]"
   echo -n " [-d <YYYYMMDD> (yesterday*)]"
-  echo -n " [-s <source> (cvttdata/cloud21*)>]"
+  echo -n " [-s <source> (cloud28/cloud21*)>]"
   echo " [-t <target_dir> (/opt/jupyter_gpu/data/crypto_md)]"
   exit 1
 }
@@ -67,7 +67,7 @@ if ! is_valid "${host}"  "${valid_hosts[@]}" ; then
     usage
 fi
 
-valid_sources=('cloud21' 'cvttdata')
+valid_sources=('cloud21' 'cloud28')
 if ! is_valid ${source} ${valid_sources[@]} ; then
     echo "Source '${source}' is not valid"
     usage

scripts/mkt_data/sim_prepare/prepare_crypto_simdata.sh

@@ -1,112 +1,60 @@
 #!/bin/bash
 
-# SQLite DDL for simulation
-# =========================
-
-
-# -- md_quotes
-
-# -- md_1min_bars
-
-
-usage() {
-  echo -n "Usage: $0"
-  echo -n " -d YYYMMDD Date>"
-  echo -n " [-O <output dir (./) >]"
-  echo -n " [-S <archive_source_host (cloud21)>]"
-  echo -n " [-D <orig_db_source> (cloud21)]"
-  echo
-  exit 1
-}
-
 # --------------------- Settings
-SourceHost=cloud21
-SourceRootDir=/opt/store/cvtt/md_archive/crypto
-DbSource=cloud21
+# SOURCE_HOST=cloud21.cvtt.vpn
+# SOURCE_ROOT_DIR=/opt/store/cvtt/md_archive/crypto
+# DB_SOURCE=cloud28
+# OUTPUT_DIR=/tmp
+# DATE=20250516
+# RSYNC_TARGETS="cvtt@hs01.cvtt.vpn:/works/cvtt/md_archive/crypto/sim/ cvtt@cloud21.cvtt.vpn:/opt/store/cvtt/md_archive/crypto/sim/"
 # --------------------- Settings
 
-while getopts ":d:O:S:D:" opt; do
-  case ${opt} in
-    d )
-      Date=$OPTARG
-      ;;
-    O )
-      OutputDir=$OPTARG
-      ;;
-    S )
-      SourceHost=$OPTARG
-      ;;
-    D )
-      DbSource=$OPTARG
-      ;;
-    \? )
-      echo "Invalid option: -$OPTARG" >&2
-      usage
-      ;;
-    : )
-      echo "Option -$OPTARG requires an argument." >&2
-      usage
-      ;;
-  esac
-done
-
-if [ -z ${Date}  ] ; then
-    echo "date is not specified"
-    usage
-fi
-if [ -z ${OutputDir}  ] ; then
-    OutputDir=.
+if [ -z ${DATE}  ] ; then
+    DATE=$(date -d 'yesterday' +'%Y%m%d')
 fi
 
-SourceHost+=".cvtt.vpn"
-mkdir -p ${OutputDir}
+if [ -z ${OUTPUT_DIR}  ] ; then
+    OUTPUT_DIR=.
+fi
 
-# --- Binance
-Instruments=( PAIR-ADA-USDT )
-Instruments+=( PAIR-BCH-USDT )
-Instruments+=( PAIR-BTC-USDT )
-Instruments+=( PAIR-DOT-USDT )
-Instruments+=( PAIR-ETH-USDT )
-Instruments+=( PAIR-LTC-USDT )
-Instruments+=( PAIR-SOL-USDT )
-Instruments+=( PAIR-USDC-USDT )
-Instruments+=( PAIR-XRP-USDT )
+echo "DATE=${DATE} SOURCE_HOST=${SOURCE_HOST}"
 
-# --- Coinbase
-Instruments+=( PAIR-ADA-USD )
-Instruments+=( PAIR-BCH-USD )
-Instruments+=( PAIR-BTC-USD )
-Instruments+=( PAIR-DOT-USD )
-Instruments+=( PAIR-ETH-USD )
-Instruments+=( PAIR-LTC-USD )
-Instruments+=( PAIR-SOL-USD )
-Instruments+=( PAIR-XRP-USD )
+mkdir -p ${OUTPUT_DIR}
 
-echo "Date=${Date} Instruments=${Instruments[@]} OutputDir=${OutputDir}"
-echo Getting data from ${DataHost} ...
+year=$(date -d ${DATE} +"%Y")
+month=$(date -d ${DATE} +"%m")
+SourceDir="${SOURCE_ROOT_DIR}/${DB_SOURCE}/${year}/${month}"
+SourceFile="${DATE}.mktdata.db.gz"
+SourceFilePath="${SourceDir}/${SourceFile}"
 
-year=$(date -d ${Date} +"%Y")
-month=$(date -d ${Date} +"%m")
-SourceDir="${SourceRootDir}/${DbSource}/${year}/${month}"
-SourceFile="${SourceDir}/${Date}.mktdata.db.gz"
-
-Cmd="rsync -ahv"
-Cmd+=" ${SourceHost}:${SourceFile}"
-Cmd+=" $OutputDir/"
+Cmd="/usr/bin/rsync -ahv"
+Cmd+=" -e 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'"
+Cmd+=" ${SOURCE_HOST}:${SourceFilePath}"
+Cmd+=" $OUTPUT_DIR/"
 echo ${Cmd}
 eval ${Cmd}
 
-Cmd="(cd ${OutputDir} && gunzip *.db.gz)"
+if [ ! -f ${OUTPUT_DIR}/${SourceFile} ] ; then
+    echo "File ${OUTPUT_DIR}/${SourceFile} NOT FOUND"
+    exit
+fi
+Cmd="(cd ${OUTPUT_DIR} && gunzip -f *.db.gz)"
 echo ${Cmd}
 eval ${Cmd}
 
-SourceDbFile="${OutputDir}/${Date}.mktdata.db"
-ResultDbFile="${OutputDir}/${Date}.crypto_sim_md.db"
+SourceDbFile="${OUTPUT_DIR}/${DATE}.mktdata.db"
+ResultDbFile="${OUTPUT_DIR}/${DATE}.crypto_sim_md.db"
 
+echo "SourceDbFile=${SourceDbFile}"
 echo "Creating Result Database File ${ResultDbFile}"
+cleanup() {
+    rm ${SourceDbFile}
+}
+trap cleanup EXIT
 
 echo "Creating table md_trades ..."
 sqlite3 ${ResultDbFile} <<EOF
+.echo ON
 CREATE TABLE  IF NOT EXISTS md_trades (
     tstamp text,
     tstamp_ns integer,
@@ -119,12 +67,14 @@ CREATE TABLE  IF NOT EXISTS md_trades (
     condition text,
     tape text
 );
+
 CREATE UNIQUE INDEX  IF NOT EXISTS md_trades_uidx
 ON md_trades(tstamp_ns, exchange_id, instrument_id);
 EOF
 
 echo "Creating table md_quotes ..."
 sqlite3 ${ResultDbFile} <<EOF
+.echo ON
 CREATE TABLE  IF NOT EXISTS md_quotes (
     tstamp text,
     tstamp_ns integer,
@@ -143,6 +93,7 @@ EOF
 
 echo "Creating table md_1min_bars ..."
 sqlite3 ${ResultDbFile} <<EOF
+.echo ON
 CREATE TABLE  IF NOT EXISTS md_1min_bars (
 	tstamp text,
 	tstamp_ns integer,
@@ -162,6 +113,7 @@ EOF
 
 echo "Loading md_trades ..."
 sqlite3  ${ResultDbFile} <<EOF
+.echo ON
 ATTACH '${SourceDbFile}' AS source_db;
 BEGIN;
 INSERT OR IGNORE INTO md_trades SELECT
@@ -199,6 +151,7 @@ EOF
 
 echo "Loading md_quotes ..."
 sqlite3  ${ResultDbFile} <<EOF
+.echo ON
 ATTACH '${SourceDbFile}' AS source_db;
 BEGIN;
 INSERT OR IGNORE INTO md_quotes SELECT
@@ -237,6 +190,7 @@ EOF
 
 echo "Loading md_1min_bars ..."
 sqlite3  ${ResultDbFile} <<EOF
+.echo ON
 ATTACH '${SourceDbFile}' AS source_db;
 BEGIN;
 INSERT OR IGNORE INTO md_1min_bars SELECT
@@ -273,25 +227,17 @@ COMMIT;
 DETACH source_db;
 EOF
 
-Cmd="rm ${SourceDbFile}"
-echo ${Cmd}
-eval ${Cmd}
-
-
 Cmd="gzip ${ResultDbFile}"
 echo ${Cmd}
 eval ${Cmd}
 
-Cmd="rsync -ahvv ${ResultDbFile}.gz cvtt@hs01.cvtt.vpn:/works/cvtt/md_archive/crypto/sim/"
-echo ${Cmd}
-eval ${Cmd}
-
-Cmd="rsync -ahvv ${ResultDbFile}.gz cvtt@cloud21.cvtt.vpn:/opt/store/cvtt/md_archive/crypto/sim/"
-echo ${Cmd}
-eval ${Cmd}
-
-Cmd="rm ${ResultDbFile}.gz"
+for tgt in ${RSYNC_TARGETS} ; do 
+    tgt="${tgt}/${year}/${month}/"
+    Cmd="/usr/bin/rsync -ahv"
+    Cmd+=" -e 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'"
+    Cmd+=" ${ResultDbFile}.gz ${tgt}"
     echo ${Cmd}
     eval ${Cmd}
+done 
 
 echo Done $0 ${*}

scripts/mkt_data/sim_prepare/prepare_eqt_simdata.sh

@@ -1,23 +1,27 @@
 #!/bin/bash
 
-usage() {
-  echo "Usage: $0  -S <symbols> -d <YYYYMMDD Date> [-O <output dir (./) >]"
-  exit 1
-}
-
 # --------------------- Settings
-SourceHost=cloud21.cvtt.vpn
-SourceRootDir=/opt/store/cvtt/md_archive/equity/alpaca_md
+# SOURCE_HOST=cloud21.cvtt.vpn
+# SOURCE_ROOT_DIR=/opt/store/cvtt/md_archive/equity/alpaca_md
+# SYMBOL_LIST=CAN #,COIN,GBTC,HOOD,MSTR,PYPL,XYZ
+# OUTPUT_DIR=/tmp
+# DATE=20250514
+# RSYNC_TARGETS="cvtt@hs01.cvtt.vpn:/works/cvtt/md_archive/equity/test/alpaca_md/sim/"
+# RSYNC_TARGETS="cvtt@hs01.cvtt.vpn:/works/cvtt/md_archive/equity/alpaca_md/sim/ 
+#cvtt@cloud21.cvtt.vpn:/opt/store/cvtt/md_archive/equity/alpaca_md/sim/"
 # --------------------- Settings
 
-
 is_business_day() {
     dt=${1}
     date=$(date -d "${dt}" +"%Y-%m-%d")
 
     CalendarURL=https://trading-calendar.cvtt.net/api/v1/markets/hours?mic=XNYS
     URL="${CalendarURL}&start=${date}&end=${date}"
+    echo "URL=${URL}"
+    # curl $URL
     open_time=$(curl -s "${URL}" | jq '.[] | .open_time')
+    echo "open_time=${open_time}"
+
     if [ -n  "${open_time}" ]; then
         return 0
     else
@@ -27,83 +31,57 @@ is_business_day() {
 }
 export -f is_business_day
 
-
-while getopts ":d:S:O:" opt; do
-  case ${opt} in
-    d )
-      Date=$OPTARG
-      ;;
-    S )
-      SymList=$OPTARG
-      ;;
-    O )
-      OutputDir=$OPTARG
-      ;;
-    \? )
-      echo "Invalid option: -$OPTARG" >&2
-      usage
-      ;;
-    : )
-      echo "Option -$OPTARG requires an argument." >&2
-      usage
-      ;;
-  esac
-done
-
-if [ -z ${SymList}  ] ; then
+if [ -z ${SYMBOL_LIST}  ] ; then
     echo "symbols are not specified"
-    usage
+    exit
 fi
-if [ -z ${Date}  ] ; then
-    echo "date is not specified"
-    usage
+if [ -z ${DATE}  ] ; then
+    DATE=$(date -d 'yesterday' +'%Y%m%d')
 fi
-if [ -z ${OutputDir}  ] ; then
-    OutputDir=.
-fi
-mkdir -p ${OutputDir}
 
-if ! is_business_day ${Date}; then
-   echo "${Date} is not business day"
-   usage
+mkdir -p ${OUTPUT_DIR}
+
+if ! is_business_day ${DATE}; then
+   echo "${DATE} is not business day"
+   exit
 fi
 
 OLD_IFS=${IFS}
 IFS=","
-read -ra Symbols <<< "${SymList}"
+read -ra Symbols <<< "${SYMBOL_LIST}"
 IFS=${OLD_IFS}
 
-echo "Date=${Date} Symbols=${Symbols[@]} OutputDir=${OutputDir}"
+echo "DATE=${DATE} Symbols=${Symbols[@]} OUTPUT_DIR=${OUTPUT_DIR}"
 echo Getting data from ${DataHost} ...
 
-year=$(date -d ${Date} +"%Y")
+year=$(date -d ${DATE} +"%Y")
 for sym in ${Symbols[@]}; do
     inst_id="STOCK-${sym}"
     capital=${sym:0:1}
-    SourceDir="${SourceRootDir}/${year}/${capital}/${sym}"
-    SourceHbarFile="${SourceDir}/${Date}.${sym}.alpaca_1m_bars.db.gz"
-    SourceQatFile="${SourceDir}/${Date}.${sym}.alpaca_qat.db.gz"
+    SourceDir="${SOURCE_ROOT_DIR}/${year}/${capital}/${sym}"
+    SourceHbarFile="${SourceDir}/${DATE}.${sym}.alpaca_1m_bars.db.gz"
+    SourceQatFile="${SourceDir}/${DATE}.${sym}.alpaca_qat.db.gz"
 
     for src_file in ${SourceHbarFile} ${SourceQatFile}; do
         Cmd="rsync -ahv"
-        Cmd+=" ${SourceHost}:${src_file}"
-        Cmd+=" $OutputDir/"
+        Cmd+=" -e 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'"
+        Cmd+=" ${SOURCE_HOST}:${src_file}"
+        Cmd+=" $OUTPUT_DIR/"
         echo ${Cmd}
         eval ${Cmd}
     done
 done
 
-Cmd="(cd ${OutputDir} && gunzip *.db.gz)"
+Cmd="(cd ${OUTPUT_DIR} && gunzip *.db.gz)"
 echo ${Cmd}
 eval ${Cmd}
 
-ResultDbFile="${OutputDir}/${Date}.alpaca_sim_md.db"
-echo "Creating Result Database File ${ResultDbFile}"
-
+ResultDbFile="${OUTPUT_DIR}/${DATE}.alpaca_sim_md.db"
 echo "Creating Result Database File ${ResultDbFile}"
 
 echo "Creating table md_trades ..."
 sqlite3 ${ResultDbFile} <<EOF
+.echo ON
 CREATE TABLE  IF NOT EXISTS md_trades (
     tstamp text,
     tstamp_ns integer,
@@ -122,6 +100,7 @@ EOF
 
 echo "Creating table md_quotes ..."
 sqlite3 ${ResultDbFile} <<EOF
+.echo ON
 CREATE TABLE  IF NOT EXISTS md_quotes (
     tstamp text,
     tstamp_ns integer,
@@ -161,11 +140,12 @@ EOF
 # set -f # not to expand *
 
 for sym in ${Symbols[@]}; do
-   src_hbar_db=${OutputDir}/${Date}.${sym}.alpaca_1m_bars.db
-   src_qat_db=${OutputDir}/${Date}.${sym}.alpaca_qat.db
+   src_hbar_db=${OUTPUT_DIR}/${DATE}.${sym}.alpaca_1m_bars.db
+   src_qat_db=${OUTPUT_DIR}/${DATE}.${sym}.alpaca_qat.db
 
     echo "Loading md_trades and md_quotes from ${src_qat_db} ..."
     sqlite3  ${ResultDbFile} <<EOF
+.echo ON
 ATTACH '${src_qat_db}' AS source_db;
 BEGIN;
 INSERT OR IGNORE INTO md_trades SELECT
@@ -200,6 +180,7 @@ EOF
 
     echo "Loading md_1min_bars from ${src_hbar_db} ..."
     sqlite3  ${ResultDbFile} <<EOF
+.echo ON
 ATTACH '${src_hbar_db}' AS source_db;
 BEGIN;
 INSERT OR IGNORE INTO md_1min_bars SELECT
@@ -229,16 +210,12 @@ Cmd="gzip ${ResultDbFile}"
 echo ${Cmd}
 eval ${Cmd}
 
-Cmd="rsync -ahvv ${ResultDbFile}.gz cvtt@hs01.cvtt.vpn:/works/cvtt/md_archive/equity/alpaca_md/sim/"
-echo ${Cmd}
-eval ${Cmd}
-
-Cmd="rsync -ahvv ${ResultDbFile}.gz cvtt@cloud21.cvtt.vpn:/opt/store/cvtt/md_archive/equity/alpaca_md/sim/"
-echo ${Cmd}
-eval ${Cmd}
-
-Cmd="rm ${ResultDbFile}.gz"
+for tgt in ${RSYNC_TARGETS} ; do 
+    Cmd="/usr/bin/rsync -ahv"
+    Cmd+=" -e 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'"
+    Cmd+=" ${ResultDbFile}.gz ${tgt}"
     echo ${Cmd}
     eval ${Cmd}
+done 
 
 echo Done $0 ${*}

utils/archive_logs.sh

@@ -11,9 +11,10 @@ function usage {
 
 echo Starting $0 $*
 
-LogDir=${1}
+# ---- D e f a u l t s
 LogArchiveDir=/works/archive/logs
 DateCriteria="2 days ago"
+# ---- D e f a u l t s
 
 
 # ---------------- cmdline

utils/move_archives.sh

@@ -1,40 +1,57 @@
 #!/bin/bash
-
-# FOR cloud hosts with limited disk space - move to storage server
+# FOR hosts with limited disk space - move to storage server
 
 function usage {
-    echo "Usage: ${0} <host> <from_dir> <days>"
+    echo -n "Usage: ${0}"
+    echo -n " -H <host_label>"
+    echo -n " [ -A <archive_dir> (default /works/archive)]"
+    echo -n " [-D <older than time criteria> (default: '2 days ago')]"
+    echo
     exit 1
 }
 
 echo Starting $0 $*
 
-
+# ---- D e f a u l t s
+ArchiveDir=/works/archive
+DateCriteria="2 days ago"
 FromHost=$(hostname -s)
+# ---- D e f a u l t s
+
+# ---------------- cmdline
+while getopts "A:H:D:" opt; do
+  case ${opt} in
+    A )
+      ArchiveDir=$OPTARG
+      ;;
+    H )
+      FromHost=$OPTARG
+      ;;
+    D )
+      DateCriteria=$OPTARG
+      ;;
+    \? )
+      echo "Invalid option: -$OPTARG" >&2
+      usage
+      ;;
+    : )
+      echo "Option -$OPTARG requires an argument." >&2
+      usage
+      ;;
+  esac
+done
+# ---------------- cmdline
+
+
 if [ "${FromHost}" == "" ]
 then
     usage
 fi
 
-ArchiveDir=${2}
-if [ "${ArchiveDir}" == "" ]
-then
-    usage
-fi
-
-Days=${3}
-if [ "${Days}" == "" ]
-then
-    Days=2
-fi
-
-DateCriteria="${Days} days ago"
-
 TargetHost=cloud21.cvtt.vpn
 TargetRootDir=/opt/store/cvtt/archive
 
-Oldest=$(date -d "${DateCriteria}" '+%Y-%m-%d')
-Now=$(date '+%Y%m%d_%H%M%S')
+Oldest=$(date -d "${DateCriteria}" '+%Y-%m-%d %H:%M:%S')
 
 echo "Looking for log files older than ${DateCriteria} in ${ArchiveDir}"
 Cmd="find ${ArchiveDir}/"
@@ -45,7 +62,7 @@ Cmd="${Cmd} -o -name '*.logs.*'"
 Cmd="${Cmd} -o -name '*.tgz'"
 Cmd="${Cmd} ')'"
 Cmd="${Cmd} -type f"
-Cmd="${Cmd} -not -newermt ${Oldest}"
+Cmd="${Cmd} -not -newermt \"${Oldest}\""
 
 echo ${Cmd}
 files=$(eval ${Cmd})