2.1.1,archive_logs interface change

VERSION

@@ -1 +1 @@
-2.0.7,OPS-10
+2.1.1,archive_logs interface change

research/load_crypto_md.sh

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
 usage() {
-  echo "Usage: $0 [-h <host (hs01*/cloud21)>] [-d <YYYYMMDD> (yesterday*)] [-s <source> (cvttdata/cloud21*)>]"
+  echo -n "Usage: $0 [-h <host (hs01*/cloud21)>]"
+  echo -n " [-d <YYYYMMDD> (yesterday*)]"
+  echo -n " [-s <source> (cvttdata/cloud21*)>]"
+  echo " [-t <target_dir> (/opt/jupyter_gpu/data/crypto_md)]"
   exit 1
 }
 
@@ -19,11 +22,15 @@ is_valid() {
   return 1
 }
 
+# ------- D E F A U L T S
 date=""
 host=hs01
 source=cloud21
+TargetDir="/opt/jupyter_gpu/data/crypto_md"
+# ------- D E F A U L T S
 
-while getopts ":h:d:s:" opt; do
+
+while getopts ":h:d:s:t:" opt; do
   case ${opt} in
     d )
       date=$OPTARG
@@ -34,6 +41,9 @@ while getopts ":h:d:s:" opt; do
     s )
       source=$OPTARG
       ;;
+    t )
+      TargetDir=$OPTARG
+      ;;
     \? )
       echo "Invalid option: -$OPTARG" >&2
       usage
@@ -82,7 +92,6 @@ SourceFile=$(date -d ${date} "+%Y%m%d.mktdata.db")
 SourceFileZip="${SourceFile}.gz"
 SourceFilePath=$(date -d ${date} "+${SourceRootDir}/%Y/%m/${SourceFileZip}")
 
-TargetDir="/opt/jupyter_gpu/data/crypto_md"
 TargetFile=$(date -d ${date} "+%Y%m%d.mktdata.ohlcv.db")
 TargetFilePath="${TargetDir}/${TargetFile}"
 

research/prepare_crypto_simdata.sh

@@ -10,17 +10,22 @@
 
 
 usage() {
-  echo "Usage: $0  -d YYYMMDD Date> [-O <output dir (./) >]"
+  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.cvtt.vpn
+SourceHost=cloud21
 SourceRootDir=/opt/store/cvtt/md_archive/crypto
 DbSource=cloud21
 # --------------------- Settings
 
-while getopts ":d:O:" opt; do
+while getopts ":d:O:S:D:" opt; do
   case ${opt} in
     d )
       Date=$OPTARG
@@ -28,6 +33,12 @@ while getopts ":d:O:" opt; do
     O )
       OutputDir=$OPTARG
       ;;
+    S )
+      SourceHost=$OPTARG
+      ;;
+    D )
+      DbSource=$OPTARG
+      ;;
     \? )
       echo "Invalid option: -$OPTARG" >&2
       usage
@@ -46,6 +57,8 @@ fi
 if [ -z ${OutputDir}  ] ; then
     OutputDir=.
 fi
+
+SourceHost+=".cvtt.vpn"
 mkdir -p ${OutputDir}
 
 # --- Binance

utils/archive_logs.sh

@@ -1,36 +1,62 @@
 #!/bin/bash
 
-
 function usage {
-    echo "Usage: ${0}  <log directory> [days (default 2)]"
+    echo -n "Usage: ${0}"
+    echo -n " -L <log directory>"
+    echo -n " [ -A <archive_logs_dir> (default /works/archive/logs)]"
+    echo -n " [-D <older than time criteria> (default: '2 days ago')]"
+    echo
     exit 1
 }
 
 echo Starting $0 $*
 
 LogDir=${1}
+LogArchiveDir=/works/logs
+DateCriteria="2 days ago"
+
+
+# ---------------- cmdline
+while getopts "A:L:D:" opt; do
+  case ${opt} in
+    A )
+      LogArchiveDir=$OPTARG
+      ;;
+    L )
+      LogDir=$OPTARG
+      ;;
+    D )
+      DateCriteria=$OPTARG
+      ;;
+    \? )
+      echo "Invalid option: -$OPTARG" >&2
+      usage
+      ;;
+    : )
+      echo "Option -$OPTARG requires an argument." >&2
+      usage
+      ;;
+  esac
+done
+# ---------------- cmdline
+
+
 if [ "${LogDir}" == "" ]
 then
     usage
 fi
 
-Days=${2}
+Cmd="mkdir -p ${LogArchiveDir}"
-if [ "${Days}" == "" ]
+echo ${Cmd} && eval ${Cmd}
-then
-    Days=2
-fi
 
-DateCriteria="${Days} days ago"
+echo "Looking for log files older than '${DateCriteria}' in ${LogDir}"
 
-Oldest=$(date -d "${DateCriteria}" '+%Y-%m-%d')
+Oldest=$(date -d "${DateCriteria}" '+%Y-%m-%d %H:%M:%S')
 
-echo "Looking for log files older than ${DateCriteria} in ${LogDir}"
+Cmd="find ${LogDir}/ '(' -name '*.log' -o -name '*.log.*' ')'  -type f -not -newermt \"${Oldest}\""
+echo $Cmd
 
-LogArchiveDir=${HOME}/prod/archive/logs
+files=$(eval ${Cmd})
-mkdir -p ${LogArchiveDir}
-
-echo "find ${LogDir}/ '(' -name '*.log' -o -name '*.log.*' ')'  -type f -not -newermt ${Oldest})"
-files=$(find ${LogDir}/ '(' -name '*.log' -o -name '*.log.*' ')'  -type f -not -newermt ${Oldest})
 if [ "$files" == "" ]
 then
     echo "No files found older than ${Oldest} in ${LogDir}"