diff --git a/scripts/build_release.sh b/build/build_release.sh similarity index 100% rename from scripts/build_release.sh rename to build/build_release.sh diff --git a/build/run_build.sh b/build/run_build.sh new file mode 100644 index 0000000..048a104 --- /dev/null +++ b/build/run_build.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +usage() { + echo "Usage: $0 " + exit 1 +} + +prj=${1} +if [ "" == "${prj}" ] ; then + usage +fi + +Cmd="pushd /home/oleg/develop/cvtt2" +Cmd="${Cmd} && pushall ${prj}" +Cmd="${Cmd} && ./build_release.sh -p ${prj}" +Cmd="${Cmd} && (cd ${prj}" +Cmd="${Cmd} && git pull --tags" +Cmd="${Cmd} && git pushall)" +Cmd="${Cmd} && popd" + +echo ${Cmd} +eval ${Cmd} \ No newline at end of file diff --git a/release_version.txt b/release_version.txt index f3c587d..0f46187 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.4.7,adding eqty data to research +1.4.8,mostly cleaning diff --git a/scripts/__deprecated__/bnbspot_md_recorder_start.sh b/scripts/__deprecated__/bnbspot_md_recorder_start.sh deleted file mode 100755 index 1f250f7..0000000 --- a/scripts/__deprecated__/bnbspot_md_recorder_start.sh +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/bash -Script="${0} ${*}" - -function usage { - echo "Usage: ${0} --inst_set= [--restart] [--stop] [--once] [--sleep_sec=]" - exit 1 -} - -for arg in "${@}" -do - case ${arg} in - --restart) - Restart=Y - shift - ;; - --stop) - Stop="Y" - shift - ;; - --once) - Once="Y" - shift - ;; - --inst_set=*) - InstrSet="${arg#*=}" - shift - ;; - --sleep_sec=*) - SleepSec="${arg#*=}" - shift - ;; - -*|--*) - usage - ;; - *) - ;; - esac -done - - -declare -A InstrSetInstrs -InstrSetInstrs[1]=PAIR-BTC-USDT,PAIR-ETH-USDT,PAIR-LTC-USDT,PAIR-XRP-USDT,PAIR-USDT-USD - - -if [ "${InstrSet}" == "" ] -then - usage -fi - -if [ "${SleepSec}" == "" ] -then - SleepSec=3 -fi - -Instruments=${InstrSetInstrs[${InstrSet}]} -if [ "${Instruments}" == "" ] -then - echo "Unrecognized instrument settings: ${InstrSet}" - usage -fi - -# -------------------- S e t t i n g s -RootDir=/home/cvtt/prod -# ConfigFile="${RootDir}/config/md_recorder.cfg" -ConfigFile="http://cloud11.cvtt.vpn:6789/apps/md_recorder" - -AdminPort="721${InstrSet}" -Exchange=BNBSPOT -DbCredKey=TSDB_COINBS_1 -Name=MD_RECORDER_BNBSPOT -# -------------------- S e t t i n g s - -LogFile="${RootDir}/logs/$(date '+%Y%m%d_%H%M%S').${Name}_${InstrSet}.log" - -source ${HOME}/.pyenv/python3.10-venv/bin/activate -export PYTHONPATH=${RootDir} - -Cmd="nohup" -Cmd="${Cmd} python3" -Cmd="${Cmd} ${RootDir}/cvttpy/apps/md/md_recorder.py" -Cmd="${Cmd} --config=${ConfigFile}" -Cmd="${Cmd} --active_exchanges=${Exchange}" -Cmd="${Cmd} --instruments=${Instruments}" -Cmd="${Cmd} --admin_port=${AdminPort}" -Cmd="${Cmd} --log_level=INFO" -Cmd="${Cmd} --log_file=${LogFile}" -Cmd="${Cmd} --db_credentials_key=${DbCredKey}" -Cmd="${Cmd} &" - -function start_it { - echo ${Cmd} - eval ${Cmd} & - sleep 10 -} - - -function check_it { - - if !(timeout 3 curl -s localhost:${AdminPort}/ping > /dev/null) - then - echo "${Script} doesn't respond. restarting..." - pids=$(ps -ef | grep "admin_port=${AdminPort}" | grep -v grep | tr -s ' ' |cut -d' ' -f2) - echo pids=${pids} - if [ "${pids}" != "" ] - then - kill -9 ${pids} - fi - start_it - fi -} - -function kill_it { - pids=$(ps -ef |grep "inst_set=${InstrSet}" |grep $(basename ${0}) |grep -v ${$} |grep -v grep |tr -s ' ' |cut -d' ' -f2) - - if [ "${pids}" != "" ] - then - echo "Killing ${pids} ..." - kill -9 ${pids} - fi - while (timeout 3 curl -s localhost:${AdminPort}/ping > /dev/null) - do - echo "Shutting down localhost:${AdminPort}/shutdown ..." - timeout 5 curl -s localhost:${AdminPort}/shutdown - - pids=$(ps -ef | grep "admin_port=${AdminPort}" | grep -v grep | tr -s ' ' |cut -d' ' -f2) - echo pids=${pids} - if [ "${pids}" != "" ] - then - kill -9 ${pids} - fi - done -} - -if [ "${Stop}" == "Y" ] ; then - kill_it - exit 0 -fi - -if [ "${Once}" == "Y" ] ; then - start_it - exit 0 -fi - - -if [ "${Restart}" == "Y" ] -then - kill_it -fi - -start_it -while true -do - check_it - echo "${Script} is checked" | /usr/bin/ts '[%Y-%m-%d %H:%M:%S]' - sleep ${SleepSec} -done diff --git a/scripts/__deprecated__/coinbase_md_recorder_start.sh b/scripts/__deprecated__/coinbase_md_recorder_start.sh deleted file mode 100755 index e53a8ca..0000000 --- a/scripts/__deprecated__/coinbase_md_recorder_start.sh +++ /dev/null @@ -1,161 +0,0 @@ -#!/bin/bash -Script="${0} ${*}" - -function usage { - echo "Usage: ${0} --inst_set= [--restart] [--stop] [--once] [--sleep_sec=]" - exit 1 -} - -for arg in "${@}" -do - case ${arg} in - --restart) - Restart=Y - shift - ;; - --stop) - Stop="Y" - shift - ;; - --once) - Once="Y" - shift - ;; - --inst_set=*) - InstrSet="${arg#*=}" - shift - ;; - --sleep_sec=*) - SleepSec="${arg#*=}" - shift - ;; - -*|--*) - usage - ;; - *) - ;; - esac -done - - -declare -A InstrSetInstrs -InstrSetInstrs[1]=PAIR-BTC-USD,PAIR-ETH-USD,PAIR-LTC-USD,PAIR-XRP-USD -InstrSetInstrs[2]=PAIR-USDT-USD,PAIR-MATIC-USD -InstrSetInstrs[3]=PAIR-DOGE-USD,PAIR-AVAX-USD, -InstrSetInstrs[4]=PAIR-BCH-USD,PAIR-UNI-USD,PAIR-AAVE-USD,PAIR-LINK-USD,PAIR-SOL-USD - - -if [ "${InstrSet}" == "" ] -then - usage -fi - -if [ "${SleepSec}" == "" ] -then - SleepSec=3 -fi - -Instruments=${InstrSetInstrs[${InstrSet}]} -if [ "${Instruments}" == "" ] -then - echo "Unrecognized instrument settings: ${InstrSet}" - usage -fi - -# -------------------- S e t t i n g s -RootDir=/home/cvtt/prod -# ConfigFile="${RootDir}/config/md_recorder.cfg" -ConfigFile="http://cloud11.cvtt.vpn:6789/apps/md_recorder" - -AdminPort="720${InstrSet}" -Exchange=COINBASE_AT -DbCredKey=TSDB_COINBS_1 -Name=MD_RECORDER_COINBASE -# -------------------- S e t t i n g s - -LogFile="${RootDir}/logs/$(date '+%Y%m%d_%H%M%S').${Name}_${InstrSet}.log" - -source ${HOME}/.pyenv/python3.10-venv/bin/activate -export PYTHONPATH=${RootDir} - -Cmd="nohup" -Cmd="${Cmd} python3" -Cmd="${Cmd} ${RootDir}/cvttpy/apps/md/md_recorder.py" -Cmd="${Cmd} --config=${ConfigFile}" -Cmd="${Cmd} --active_exchanges=${Exchange}" -Cmd="${Cmd} --instruments=${Instruments}" -Cmd="${Cmd} --admin_port=${AdminPort}" -Cmd="${Cmd} --log_level=INFO" -Cmd="${Cmd} --log_file=${LogFile}" -Cmd="${Cmd} --db_credentials_key=${DbCredKey}" -Cmd="${Cmd} &" - -function start_it { - echo ${Cmd} - eval ${Cmd} & - sleep 10 -} - - -function check_it { - - if !(timeout 3 curl -s localhost:${AdminPort}/ping > /dev/null) - then - echo "${Script} doesn't respond. restarting..." - pids=$(ps -ef | grep "admin_port=${AdminPort}" | grep -v grep | tr -s ' ' |cut -d' ' -f2) - echo pids=${pids} - if [ "${pids}" != "" ] - then - kill -9 ${pids} - fi - start_it - fi -} - -function kill_it { - pids=$(ps -ef |grep "inst_set=${InstrSet}" |grep $(basename ${0}) |grep -v ${$} |grep -v grep |tr -s ' ' |cut -d' ' -f2) - - if [ "${pids}" != "" ] - then - echo "Killing ${pids} ..." - kill -9 ${pids} - fi - while (timeout 3 curl -s localhost:${AdminPort}/ping > /dev/null) - do - echo "Shutting down localhost:${AdminPort}/shutdown ..." - timeout 5 curl -s localhost:${AdminPort}/shutdown - - pids=$(ps -ef | grep "admin_port=${AdminPort}" | grep -v grep | tr -s ' ' |cut -d' ' -f2) - echo pids=${pids} - if [ "${pids}" != "" ] - then - kill -9 ${pids} - fi - done -} - -if [ "${Stop}" == "Y" ] ; then - kill_it - exit 0 -fi - -if [ "${Once}" == "Y" ] ; then - start_it - exit 0 -fi - - -if [ "${Restart}" == "Y" ] -then - kill_it -fi - -start_it -while true -do - check_it - echo "${Script} is checked" | /usr/bin/ts '[%Y-%m-%d %H:%M:%S]' - sleep ${SleepSec} -done - - diff --git a/scripts/__deprecated__/config_server_start.sh b/scripts/__deprecated__/config_server_start.sh deleted file mode 100755 index e1457b4..0000000 --- a/scripts/__deprecated__/config_server_start.sh +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/bash -Script="${0} ${*}" - -function usage { - echo "Usage: ${0} [--restart] [--stop] [--once] [--sleep_sec=]" - exit 1 -} - -for arg in "${@}" -do - case ${arg} in - --restart) - Restart=Y - shift - ;; - --stop) - Stop="Y" - shift - ;; - --once) - Once="Y" - shift - ;; - --sleep_sec=*) - SleepSec="${arg#*=}" - shift - ;; - -*|--*) - usage - ;; - *) - ;; - esac -done - -if [ "${SleepSec}" == "" ] -then - SleepSec=5 -fi - -RootDir=/home/cvtt/prod -CfgSvcDir=${RootDir}/config_service - -export PYTHONPATH="${RootDir}:${PYTHONPATH}" - -Name=config_server -ServerPy="${RootDir}/cvttpy/apps/utils/config_server.py" -ServicePort=6789 -ServiceDir=${CfgSvcDir}/data -LogDir=${RootDir}/logs - -source ${HOME}/.pyenv/python3.10-venv/bin/activate -export PYTHONPATH="${RootDir}:${PYTHONPATH}" - -Cmd="nohup" -Cmd="${Cmd} python3" -Cmd="${Cmd} ${ServerPy}" -Cmd="${Cmd} --port=${ServicePort}" -Cmd="${Cmd} --root=${ServiceDir}" -Cmd="${Cmd} --log_file=${LogDir}/%T.config_service.log" - -function start_it { - echo ${Cmd} - eval ${Cmd} & - sleep 10 -} - -function check_it { - if !(timeout 3 curl -s localhost:${ServicePort}/ping > /dev/null) - then - echo "${Script} doesn't respond. restarting..." - pids=$(ps -ef | grep "port=${ServicePort}" | grep "root=${ServiceDir}" | grep -v grep | tr -s ' ' |cut -d' ' -f2) - echo pids=${pids} - if [ "${pids}" != "" ] - then - kill -9 ${pids} - fi - start_it - fi -} - -function kill_it { - pids=$(ps -ef |grep $(basename ${0}) |grep -v ${$} |grep -v grep |tr -s ' ' |cut -d' ' -f2) - - if [ "${pids}" != "" ] - then - echo "Killing ${pids} ..." - kill -9 ${pids} - fi - while (timeout 3 curl -s localhost:${ServicePort}/ping > /dev/null) - do - echo "Shutting down localhost:${ServicePort}/__shutdown__ ..." - timeout 5 curl -s localhost:${ServicePort}/__shutdown__ - - pids=$(ps -ef | grep "port=${ServicePort}" | grep "root=${ServiceDir}" | grep -v grep | tr -s ' ' |cut -d' ' -f2) - echo pids=${pids} - if [ "${pids}" != "" ] - then - kill -9 ${pids} - fi - done -} - -if [ "${Stop}" == "Y" ] ; then - kill_it - exit 0 -fi - -if [ "${Once}" == "Y" ] ; then - start_it - exit 0 -fi - - -if [ "${Restart}" == "Y" ] -then - kill_it -fi - -start_it -while true -do - check_it - echo "${Script} is checked" | /usr/bin/ts '[%Y-%m-%d %H:%M:%S]' - sleep ${SleepSec} -done - - diff --git a/scripts/__deprecated__/executor_app_start.sh b/scripts/__deprecated__/executor_app_start.sh deleted file mode 100755 index a50451a..0000000 --- a/scripts/__deprecated__/executor_app_start.sh +++ /dev/null @@ -1,144 +0,0 @@ -#!/bin/bash -Script="${0} ${*}" - -function usage { - echo "Usage: ${0} [--restart] [--stop] [--once] [--sleep_sec=]" - exit 1 -} - -for arg in "${@}" -do - case ${arg} in - --restart) - Restart=Y - shift - ;; - --stop) - Stop="Y" - shift - ;; - --once) - Once="Y" - shift - ;; - --inst_set=*) - InstrSet="${arg#*=}" - shift - ;; - --sleep_sec=*) - SleepSec="${arg#*=}" - shift - ;; - -*|--*) - usage - ;; - *) - ;; - esac -done - - -if [ "${SleepSec}" == "" ] -then - SleepSec=3 -fi - - -# -------------------- S e t t i n g s -ConfigServiceHost=cloud11.cvtt.vpn -ConfigServicePort=6789 - -RootDir=/home/cvtt/prod - -ConfigFile="http://${ConfigServiceHost}:${ConfigServicePort}/apps/executor_app" - -AdminPort="7210" -Exchange=COINBASE_AT -Name=EXECUTOR_APP -# -------------------- S e t t i n g s - -LogFile="${RootDir}/logs/$(date '+%Y%m%d_%H%M%S').${Name}.log" - -source ${HOME}/.pyenv/python3.10-venv/bin/activate -export PYTHONPATH=${RootDir} - -Cmd="nohup" -Cmd="${Cmd} python3" -Cmd="${Cmd} ${RootDir}/cvttpy/apps/executor_app.py" -Cmd="${Cmd} --config=${ConfigFile}" -Cmd="${Cmd} --active_exchanges=${Exchange}" -Cmd="${Cmd} --admin_port=${AdminPort}" -Cmd="${Cmd} --log_level=INFO" -Cmd="${Cmd} --log_file=${LogFile}" -Cmd="${Cmd} &" - -function start_it { - echo ${Cmd} - eval ${Cmd} & - sleep 10 -} - - -function check_it { - - if !(timeout 3 curl -s localhost:${AdminPort}/ping > /dev/null) - then - echo "${Script} doesn't respond. restarting..." - pids=$(ps -ef | grep "admin_port=${AdminPort}" | grep -v grep | tr -s ' ' |cut -d' ' -f2) - echo pids=${pids} - if [ "${pids}" != "" ] - then - kill -9 ${pids} - fi - start_it - fi -} - -function kill_it { - pids=$(ps -ef |grep $(basename ${0}) |grep -v ${$} |grep -v grep |tr -s ' ' |cut -d' ' -f2) - - if [ "${pids}" != "" ] - then - echo "Killing ${pids} ..." - kill -9 ${pids} - fi - while (timeout 3 curl -s localhost:${AdminPort}/ping > /dev/null) - do - echo "Shutting down localhost:${AdminPort}/shutdown ..." - timeout 5 curl -s localhost:${AdminPort}/shutdown - sleep 3 - - pids=$(ps -ef | grep "admin_port=${AdminPort}" | grep -v grep | tr -s ' ' |cut -d' ' -f2) - echo pids=${pids} - if [ "${pids}" != "" ] - then - kill -9 ${pids} - fi - done -} - -if [ "${Stop}" == "Y" ] ; then - kill_it - exit 0 -fi - -if [ "${Once}" == "Y" ] ; then - start_it - exit 0 -fi - - -if [ "${Restart}" == "Y" ] -then - kill_it -fi - -start_it -while true -do - check_it - echo "${Script} is checked" | /usr/bin/ts '[%Y-%m-%d %H:%M:%S]' - sleep ${SleepSec} -done - - diff --git a/utils/git/create_remote_repo.sh b/utils/git/create_remote_repo.sh new file mode 100755 index 0000000..e695356 --- /dev/null +++ b/utils/git/create_remote_repo.sh @@ -0,0 +1,48 @@ +#!/bin/bash + +# --------------------- +# user "git" owned remote repository +# +# must run on remote server +# change HostName and RemoteName +# --------------------- +# R e s u l t E x a m p l e: +# sudo bash -c 'mkdir /opt/store/git/cvtt2/tests.git && cd /opt/store/git/cvtt2/tests.git && git init --bare && chown -R git:git /opt/store/git/cvtt2/tests.git' +# --------------------- +# + +# ----- S e t t i n g s +HostName=cloud21.cvtt.vpn +RemoteName=origin +# ----- S e t t i n g s + +usage() { + echo "Usage: ${0} [ */opt/store/git/cvtt2]" + exit 1 +} + + +RepoName=${1} +if [ "" == "${RepoName}" ] ; then + usage +fi + +RepoParentDir=/opt/store/git/cvtt2 +if [ "${2}" != "" ] ; then + RepoParentDir=${2} +fi + +RepoDir="${RepoParentDir}/${RepoName}.git" + + +Cmd="sudo bash -c 'mkdir ${RepoDir}" +Cmd="${Cmd} && cd ${RepoDir}" +Cmd="${Cmd} && git init --bare " +Cmd="${Cmd} && chown -R git:git ${RepoDir}'" +echo ${Cmd} +eval ${Cmd} || exit 1 + +echo "=====================" +echo "Repository is created. Use this command to add it:" +echo " git remote add ${RemoteName} git@${HostName}:${RepoDir}" +echo "====================="