From c77359d6b36223afe77e87866bb682cfd31a5f78 Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Sun, 19 Nov 2023 20:17:29 -0500 Subject: [PATCH] progress --- configs/cloud16 | 0 configs/cloud16/supervisor.conf | 28 +++++++++++++++++++++++ configs/cloud17/supervisord.conf | 38 ++++++++++++++++++++++++++++++++ cronjobs/cvtt/cloud16 | 10 +++++++++ cronjobs/cvtt/cloud17 | 9 +++++--- release_version.txt | 2 +- scripts/archive_yesterday_md.sh | 7 +++++- 7 files changed, 89 insertions(+), 5 deletions(-) delete mode 100644 configs/cloud16 create mode 100644 configs/cloud16/supervisor.conf create mode 100644 cronjobs/cvtt/cloud16 diff --git a/configs/cloud16 b/configs/cloud16 deleted file mode 100644 index e69de29..0000000 diff --git a/configs/cloud16/supervisor.conf b/configs/cloud16/supervisor.conf new file mode 100644 index 0000000..45a802d --- /dev/null +++ b/configs/cloud16/supervisor.conf @@ -0,0 +1,28 @@ +[supervisord] +environment=PYTHONPATH="/home/cvtt/prod" +autostart=true +autorestart=unexpected +startretries=3 +logfile=/home/cvtt/prod/logs/supervisord.log + +[supervisorctl] + +[inet_http_server] +port = 127.0.0.1:9001 + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[program:config_service] +directory=/home/cvtt/prod +command=/home/cvtt/.pyenv/python3.10-venv/bin/python3.10 + -u /home/cvtt/prod/cvttpy/apps/utils/config_server.py + --port=6789 + --root=/home/cvtt/prod/config_service/data + --log_file=/home/cvtt/prod/logs/%%T.CONFIG_SERVICE.log +autostart=true +autorestart=true +startretries=1 +startsecs=3 +user=cvtt + diff --git a/configs/cloud17/supervisord.conf b/configs/cloud17/supervisord.conf index be43fee..6205431 100644 --- a/configs/cloud17/supervisord.conf +++ b/configs/cloud17/supervisord.conf @@ -101,3 +101,41 @@ autorestart=true startretries=1 startsecs=3 user=cvtt + +[group:bnbfut_mdrec] +programs= + bnbfut_rec_cloud17, + bnbfut_rec_cv1 + +[program:bnbfut_rec_cloud17] +directory=/home/cvtt/prod +command=/home/cvtt/.pyenv/python3.10-venv/bin/python3 -u /home/cvtt/prod/cvttpy/apps/md/md_recorder.py + --config=http://cloud16.cvtt.vpn:6789/apps/md_recorder + --active_exchanges=BNBFUT + --instruments=PERP-BTC-USDT,PERP-ETH-USDT + --db_credentials_key=TSDB_MD_CLD17 + --admin_port=7225 + --log_level=INFO + --log_file=/home/cvtt/prod/logs/%%T.MD_REC.BNBFUT.CLD17.log +autostart=true +autorestart=true +startretries=1 +startsecs=3 +user=cvtt + +[program:bnbfut_rec_cv1] +directory=/home/cvtt/prod +command=/home/cvtt/.pyenv/python3.10-venv/bin/python3 -u /home/cvtt/prod/cvttpy/apps/md/md_recorder.py + --config=http://cloud16.cvtt.vpn:6789/apps/md_recorder + --active_exchanges=BNBFUT + --instruments=PERP-BTC-USDT,PERP-ETH-USDT + --db_credentials_key=TSDB_MD_CV1 + --admin_port=7226 + --log_level=INFO + --log_file=/home/cvtt/prod/logs/%%T.MD_REC.BNBFUT.CV1.log +autostart=true +autorestart=true +startretries=1 +startsecs=3 +user=cvtt + diff --git a/cronjobs/cvtt/cloud16 b/cronjobs/cvtt/cloud16 new file mode 100644 index 0000000..ab1791a --- /dev/null +++ b/cronjobs/cvtt/cloud16 @@ -0,0 +1,10 @@ +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 diff --git a/cronjobs/cvtt/cloud17 b/cronjobs/cvtt/cloud17 index d07ad20..11b5314 100644 --- a/cronjobs/cvtt/cloud17 +++ b/cronjobs/cvtt/cloud17 @@ -1,8 +1,11 @@ -0 6 * * * /usr/bin/supervisorctl -c /home/cvtt/prod/config/supervisor/supervisord.conf restart 'bnb_spot_md_recorder:*' 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 -0 6 * * * /usr/bin/supervisorctl -c /home/cvtt/prod/config/supervisor/supervisord.conf restart 'coinbase_md_recorder:*' 2>&1 | /usr/bin/ts '[\%Y-\%m-\%d \%H:\%M:\%S]' > /home/cvtt/prod/logs/$(date +\%Y\%m\%d_\%H\%M\%S).coinbase_md_recorder.restart.log +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 +#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 diff --git a/release_version.txt b/release_version.txt index b003284..a45be46 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -0.2.7 +0.2.8 diff --git a/scripts/archive_yesterday_md.sh b/scripts/archive_yesterday_md.sh index a48111b..3b3c731 100755 --- a/scripts/archive_yesterday_md.sh +++ b/scripts/archive_yesterday_md.sh @@ -7,7 +7,12 @@ export PYTHONPATH=${RootDir} #dates=$(start=20231107; end=20231118; dt=; n=0; until [ "$dt" = "$end" ]; do ((n++)); dt=$(date -d "$start + $n days" +%Y%m%d); echo $dt; done) yesterday=$(date -d "yesterday" +%Y%m%d) -Schemas="coinbase,bnbspot" +Schemas=${1} +if [ "${Schemas}" == "" ] +then + Schemas="coinbase,bnbspot,bnbfut" +fi +echo "Schemas=${Schemas}" Cmd= Cmd="${Python}"