From 4681f22e717c1eecf820293d7d87f8063161cabb Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 7 May 2025 15:22:31 +0000 Subject: [PATCH] deploy: Move configurations to new stutter dir "app_sparkd" --- src/app_sparkd/configurations/alphaworx_prod/.env | 4 ++++ .../configurations/alphaworx_prod/README.txt | 0 .../configurations/alphaworx_prod/binance_1.json | 0 .../configurations/alphaworx_prod/binance_usds_futures_1.json | 0 .../configurations/alphaworx_prod/init_env.py | 0 .../configurations/alphaworx_prod/spark.conf | 0 .../configurations/alphaworx_prod/symbols.conf | 0 .../configurations/alphaworx_zen_hk_live/.env | 2 +- .../configurations/alphaworx_zen_hk_live/README.txt | 0 .../configurations/alphaworx_zen_hk_live/binance_1.json | 0 .../alphaworx_zen_hk_live/binance_usds_futures_1.json | 0 .../configurations/alphaworx_zen_hk_live/init_env.py | 0 .../configurations/alphaworx_zen_hk_live/spark.conf | 0 .../configurations/alphaworx_zen_hk_live/symbols.conf | 0 src/app_sparkd/configurations/binance_dev/.env | 2 ++ .../configurations/binance_dev/README.txt | 0 .../configurations/binance_dev/binance_1.json | 0 .../configurations/binance_dev/binance_usds_futures_1.json | 0 .../configurations/binance_dev/init_env.py | 0 .../configurations/binance_dev/spark.conf | 0 .../configurations/binance_dev/symbols.conf | 0 src/app_sparkd/configurations/dev/.env | 2 ++ .../sparkd => app_sparkd}/configurations/dev/README.txt | 0 .../sparkd => app_sparkd}/configurations/dev/binance_1.json | 0 .../configurations/dev/binance_usds_futures_1.json | 0 .../sparkd => app_sparkd}/configurations/dev/spark.conf | 0 .../sparkd => app_sparkd}/configurations/dev/symbols.conf | 0 src/app_sparkd/configurations/sim_dev/.env | 2 ++ .../sparkd => app_sparkd}/configurations/sim_dev/README.txt | 0 .../sparkd => app_sparkd}/configurations/sim_dev/spark.conf | 0 .../sparkd => app_sparkd}/configurations/sim_dev/symbols.conf | 0 src/server/sparkd/configurations/alphaworx_prod/.env | 4 ---- src/server/sparkd/configurations/binance_dev/.env | 2 -- src/server/sparkd/configurations/dev/.env | 2 -- src/server/sparkd/configurations/sim_dev/.env | 2 -- tools/py/deploy.py | 2 +- tools/sparkd_profile.sh | 2 +- 37 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 src/app_sparkd/configurations/alphaworx_prod/.env rename src/{server/sparkd => app_sparkd}/configurations/alphaworx_prod/README.txt (100%) rename src/{server/sparkd => app_sparkd}/configurations/alphaworx_prod/binance_1.json (100%) rename src/{server/sparkd => app_sparkd}/configurations/alphaworx_prod/binance_usds_futures_1.json (100%) rename src/{server/sparkd => app_sparkd}/configurations/alphaworx_prod/init_env.py (100%) rename src/{server/sparkd => app_sparkd}/configurations/alphaworx_prod/spark.conf (100%) rename src/{server/sparkd => app_sparkd}/configurations/alphaworx_prod/symbols.conf (100%) rename src/{server/sparkd => app_sparkd}/configurations/alphaworx_zen_hk_live/.env (62%) rename src/{server/sparkd => app_sparkd}/configurations/alphaworx_zen_hk_live/README.txt (100%) rename src/{server/sparkd => app_sparkd}/configurations/alphaworx_zen_hk_live/binance_1.json (100%) rename src/{server/sparkd => app_sparkd}/configurations/alphaworx_zen_hk_live/binance_usds_futures_1.json (100%) rename src/{server/sparkd => app_sparkd}/configurations/alphaworx_zen_hk_live/init_env.py (100%) rename src/{server/sparkd => app_sparkd}/configurations/alphaworx_zen_hk_live/spark.conf (100%) rename src/{server/sparkd => app_sparkd}/configurations/alphaworx_zen_hk_live/symbols.conf (100%) create mode 100644 src/app_sparkd/configurations/binance_dev/.env rename src/{server/sparkd => app_sparkd}/configurations/binance_dev/README.txt (100%) rename src/{server/sparkd => app_sparkd}/configurations/binance_dev/binance_1.json (100%) rename src/{server/sparkd => app_sparkd}/configurations/binance_dev/binance_usds_futures_1.json (100%) rename src/{server/sparkd => app_sparkd}/configurations/binance_dev/init_env.py (100%) rename src/{server/sparkd => app_sparkd}/configurations/binance_dev/spark.conf (100%) rename src/{server/sparkd => app_sparkd}/configurations/binance_dev/symbols.conf (100%) create mode 100644 src/app_sparkd/configurations/dev/.env rename src/{server/sparkd => app_sparkd}/configurations/dev/README.txt (100%) rename src/{server/sparkd => app_sparkd}/configurations/dev/binance_1.json (100%) rename src/{server/sparkd => app_sparkd}/configurations/dev/binance_usds_futures_1.json (100%) rename src/{server/sparkd => app_sparkd}/configurations/dev/spark.conf (100%) rename src/{server/sparkd => app_sparkd}/configurations/dev/symbols.conf (100%) create mode 100644 src/app_sparkd/configurations/sim_dev/.env rename src/{server/sparkd => app_sparkd}/configurations/sim_dev/README.txt (100%) rename src/{server/sparkd => app_sparkd}/configurations/sim_dev/spark.conf (100%) rename src/{server/sparkd => app_sparkd}/configurations/sim_dev/symbols.conf (100%) delete mode 100644 src/server/sparkd/configurations/alphaworx_prod/.env delete mode 100644 src/server/sparkd/configurations/binance_dev/.env delete mode 100644 src/server/sparkd/configurations/dev/.env delete mode 100644 src/server/sparkd/configurations/sim_dev/.env diff --git a/src/app_sparkd/configurations/alphaworx_prod/.env b/src/app_sparkd/configurations/alphaworx_prod/.env new file mode 100644 index 000000000..1afb86237 --- /dev/null +++ b/src/app_sparkd/configurations/alphaworx_prod/.env @@ -0,0 +1,4 @@ +SPARKD__CONFIG_DIR=src/app_sparkd/configurations/alphaworx_prod +SPARKD__SHM_SIZE=8gb +SPARKD__MEMORY=8gb +SPARKD__RUNTIME_CONF_DIR=/home/ubuntu/8000/sparkdata/conf/ diff --git a/src/server/sparkd/configurations/alphaworx_prod/README.txt b/src/app_sparkd/configurations/alphaworx_prod/README.txt similarity index 100% rename from src/server/sparkd/configurations/alphaworx_prod/README.txt rename to src/app_sparkd/configurations/alphaworx_prod/README.txt diff --git a/src/server/sparkd/configurations/alphaworx_prod/binance_1.json b/src/app_sparkd/configurations/alphaworx_prod/binance_1.json similarity index 100% rename from src/server/sparkd/configurations/alphaworx_prod/binance_1.json rename to src/app_sparkd/configurations/alphaworx_prod/binance_1.json diff --git a/src/server/sparkd/configurations/alphaworx_prod/binance_usds_futures_1.json b/src/app_sparkd/configurations/alphaworx_prod/binance_usds_futures_1.json similarity index 100% rename from src/server/sparkd/configurations/alphaworx_prod/binance_usds_futures_1.json rename to src/app_sparkd/configurations/alphaworx_prod/binance_usds_futures_1.json diff --git a/src/server/sparkd/configurations/alphaworx_prod/init_env.py b/src/app_sparkd/configurations/alphaworx_prod/init_env.py similarity index 100% rename from src/server/sparkd/configurations/alphaworx_prod/init_env.py rename to src/app_sparkd/configurations/alphaworx_prod/init_env.py diff --git a/src/server/sparkd/configurations/alphaworx_prod/spark.conf b/src/app_sparkd/configurations/alphaworx_prod/spark.conf similarity index 100% rename from src/server/sparkd/configurations/alphaworx_prod/spark.conf rename to src/app_sparkd/configurations/alphaworx_prod/spark.conf diff --git a/src/server/sparkd/configurations/alphaworx_prod/symbols.conf b/src/app_sparkd/configurations/alphaworx_prod/symbols.conf similarity index 100% rename from src/server/sparkd/configurations/alphaworx_prod/symbols.conf rename to src/app_sparkd/configurations/alphaworx_prod/symbols.conf diff --git a/src/server/sparkd/configurations/alphaworx_zen_hk_live/.env b/src/app_sparkd/configurations/alphaworx_zen_hk_live/.env similarity index 62% rename from src/server/sparkd/configurations/alphaworx_zen_hk_live/.env rename to src/app_sparkd/configurations/alphaworx_zen_hk_live/.env index fe5990a0a..1939999c2 100644 --- a/src/server/sparkd/configurations/alphaworx_zen_hk_live/.env +++ b/src/app_sparkd/configurations/alphaworx_zen_hk_live/.env @@ -1,4 +1,4 @@ -SPARKD__CONFIG_DIR=src/server/sparkd/configurations/alphaworx_zen_hk_live +SPARKD__CONFIG_DIR=src/app_sparkd/configurations/alphaworx_zen_hk_live SPARKD__SHM_SIZE=8gb SPARKD__MEMORY=8gb SPARKD__IMAGE=sparkd_symbols diff --git a/src/server/sparkd/configurations/alphaworx_zen_hk_live/README.txt b/src/app_sparkd/configurations/alphaworx_zen_hk_live/README.txt similarity index 100% rename from src/server/sparkd/configurations/alphaworx_zen_hk_live/README.txt rename to src/app_sparkd/configurations/alphaworx_zen_hk_live/README.txt diff --git a/src/server/sparkd/configurations/alphaworx_zen_hk_live/binance_1.json b/src/app_sparkd/configurations/alphaworx_zen_hk_live/binance_1.json similarity index 100% rename from src/server/sparkd/configurations/alphaworx_zen_hk_live/binance_1.json rename to src/app_sparkd/configurations/alphaworx_zen_hk_live/binance_1.json diff --git a/src/server/sparkd/configurations/alphaworx_zen_hk_live/binance_usds_futures_1.json b/src/app_sparkd/configurations/alphaworx_zen_hk_live/binance_usds_futures_1.json similarity index 100% rename from src/server/sparkd/configurations/alphaworx_zen_hk_live/binance_usds_futures_1.json rename to src/app_sparkd/configurations/alphaworx_zen_hk_live/binance_usds_futures_1.json diff --git a/src/server/sparkd/configurations/alphaworx_zen_hk_live/init_env.py b/src/app_sparkd/configurations/alphaworx_zen_hk_live/init_env.py similarity index 100% rename from src/server/sparkd/configurations/alphaworx_zen_hk_live/init_env.py rename to src/app_sparkd/configurations/alphaworx_zen_hk_live/init_env.py diff --git a/src/server/sparkd/configurations/alphaworx_zen_hk_live/spark.conf b/src/app_sparkd/configurations/alphaworx_zen_hk_live/spark.conf similarity index 100% rename from src/server/sparkd/configurations/alphaworx_zen_hk_live/spark.conf rename to src/app_sparkd/configurations/alphaworx_zen_hk_live/spark.conf diff --git a/src/server/sparkd/configurations/alphaworx_zen_hk_live/symbols.conf b/src/app_sparkd/configurations/alphaworx_zen_hk_live/symbols.conf similarity index 100% rename from src/server/sparkd/configurations/alphaworx_zen_hk_live/symbols.conf rename to src/app_sparkd/configurations/alphaworx_zen_hk_live/symbols.conf diff --git a/src/app_sparkd/configurations/binance_dev/.env b/src/app_sparkd/configurations/binance_dev/.env new file mode 100644 index 000000000..5f5cd81c8 --- /dev/null +++ b/src/app_sparkd/configurations/binance_dev/.env @@ -0,0 +1,2 @@ +SPARKD__CONFIG_DIR=src/app_sparkd/configurations/binance_dev +SPARKD__SHM_SIZE=8gb diff --git a/src/server/sparkd/configurations/binance_dev/README.txt b/src/app_sparkd/configurations/binance_dev/README.txt similarity index 100% rename from src/server/sparkd/configurations/binance_dev/README.txt rename to src/app_sparkd/configurations/binance_dev/README.txt diff --git a/src/server/sparkd/configurations/binance_dev/binance_1.json b/src/app_sparkd/configurations/binance_dev/binance_1.json similarity index 100% rename from src/server/sparkd/configurations/binance_dev/binance_1.json rename to src/app_sparkd/configurations/binance_dev/binance_1.json diff --git a/src/server/sparkd/configurations/binance_dev/binance_usds_futures_1.json b/src/app_sparkd/configurations/binance_dev/binance_usds_futures_1.json similarity index 100% rename from src/server/sparkd/configurations/binance_dev/binance_usds_futures_1.json rename to src/app_sparkd/configurations/binance_dev/binance_usds_futures_1.json diff --git a/src/server/sparkd/configurations/binance_dev/init_env.py b/src/app_sparkd/configurations/binance_dev/init_env.py similarity index 100% rename from src/server/sparkd/configurations/binance_dev/init_env.py rename to src/app_sparkd/configurations/binance_dev/init_env.py diff --git a/src/server/sparkd/configurations/binance_dev/spark.conf b/src/app_sparkd/configurations/binance_dev/spark.conf similarity index 100% rename from src/server/sparkd/configurations/binance_dev/spark.conf rename to src/app_sparkd/configurations/binance_dev/spark.conf diff --git a/src/server/sparkd/configurations/binance_dev/symbols.conf b/src/app_sparkd/configurations/binance_dev/symbols.conf similarity index 100% rename from src/server/sparkd/configurations/binance_dev/symbols.conf rename to src/app_sparkd/configurations/binance_dev/symbols.conf diff --git a/src/app_sparkd/configurations/dev/.env b/src/app_sparkd/configurations/dev/.env new file mode 100644 index 000000000..8182fd7f3 --- /dev/null +++ b/src/app_sparkd/configurations/dev/.env @@ -0,0 +1,2 @@ +SPARKD__CONFIG_DIR=src/app_sparkd/configurations/dev +SPARKD__SHM_SIZE=8gb diff --git a/src/server/sparkd/configurations/dev/README.txt b/src/app_sparkd/configurations/dev/README.txt similarity index 100% rename from src/server/sparkd/configurations/dev/README.txt rename to src/app_sparkd/configurations/dev/README.txt diff --git a/src/server/sparkd/configurations/dev/binance_1.json b/src/app_sparkd/configurations/dev/binance_1.json similarity index 100% rename from src/server/sparkd/configurations/dev/binance_1.json rename to src/app_sparkd/configurations/dev/binance_1.json diff --git a/src/server/sparkd/configurations/dev/binance_usds_futures_1.json b/src/app_sparkd/configurations/dev/binance_usds_futures_1.json similarity index 100% rename from src/server/sparkd/configurations/dev/binance_usds_futures_1.json rename to src/app_sparkd/configurations/dev/binance_usds_futures_1.json diff --git a/src/server/sparkd/configurations/dev/spark.conf b/src/app_sparkd/configurations/dev/spark.conf similarity index 100% rename from src/server/sparkd/configurations/dev/spark.conf rename to src/app_sparkd/configurations/dev/spark.conf diff --git a/src/server/sparkd/configurations/dev/symbols.conf b/src/app_sparkd/configurations/dev/symbols.conf similarity index 100% rename from src/server/sparkd/configurations/dev/symbols.conf rename to src/app_sparkd/configurations/dev/symbols.conf diff --git a/src/app_sparkd/configurations/sim_dev/.env b/src/app_sparkd/configurations/sim_dev/.env new file mode 100644 index 000000000..8ce7375fa --- /dev/null +++ b/src/app_sparkd/configurations/sim_dev/.env @@ -0,0 +1,2 @@ +SPARKD__CONFIG_DIR=src/app_sparkd/configurations/sim_dev +SPARKD__SHM_SIZE=8gb diff --git a/src/server/sparkd/configurations/sim_dev/README.txt b/src/app_sparkd/configurations/sim_dev/README.txt similarity index 100% rename from src/server/sparkd/configurations/sim_dev/README.txt rename to src/app_sparkd/configurations/sim_dev/README.txt diff --git a/src/server/sparkd/configurations/sim_dev/spark.conf b/src/app_sparkd/configurations/sim_dev/spark.conf similarity index 100% rename from src/server/sparkd/configurations/sim_dev/spark.conf rename to src/app_sparkd/configurations/sim_dev/spark.conf diff --git a/src/server/sparkd/configurations/sim_dev/symbols.conf b/src/app_sparkd/configurations/sim_dev/symbols.conf similarity index 100% rename from src/server/sparkd/configurations/sim_dev/symbols.conf rename to src/app_sparkd/configurations/sim_dev/symbols.conf diff --git a/src/server/sparkd/configurations/alphaworx_prod/.env b/src/server/sparkd/configurations/alphaworx_prod/.env deleted file mode 100644 index 19a313513..000000000 --- a/src/server/sparkd/configurations/alphaworx_prod/.env +++ /dev/null @@ -1,4 +0,0 @@ -SPARKD__CONFIG_DIR=src/server/sparkd/configurations/alphaworx_prod -SPARKD__SHM_SIZE=8gb -SPARKD__MEMORY=8gb -SPARKD__RUNTIME_CONF_DIR=/home/ubuntu/8000/sparkdata/conf/ \ No newline at end of file diff --git a/src/server/sparkd/configurations/binance_dev/.env b/src/server/sparkd/configurations/binance_dev/.env deleted file mode 100644 index 42aea7d1a..000000000 --- a/src/server/sparkd/configurations/binance_dev/.env +++ /dev/null @@ -1,2 +0,0 @@ -SPARKD__CONFIG_DIR=src/server/sparkd/configurations/binance_dev -SPARKD__SHM_SIZE=8gb diff --git a/src/server/sparkd/configurations/dev/.env b/src/server/sparkd/configurations/dev/.env deleted file mode 100644 index df69d528b..000000000 --- a/src/server/sparkd/configurations/dev/.env +++ /dev/null @@ -1,2 +0,0 @@ -SPARKD__CONFIG_DIR=src/server/sparkd/configurations/dev -SPARKD__SHM_SIZE=8gb diff --git a/src/server/sparkd/configurations/sim_dev/.env b/src/server/sparkd/configurations/sim_dev/.env deleted file mode 100644 index c395ebc81..000000000 --- a/src/server/sparkd/configurations/sim_dev/.env +++ /dev/null @@ -1,2 +0,0 @@ -SPARKD__CONFIG_DIR=src/server/sparkd/configurations/sim_dev -SPARKD__SHM_SIZE=8gb diff --git a/tools/py/deploy.py b/tools/py/deploy.py index ce34f54df..589365dee 100644 --- a/tools/py/deploy.py +++ b/tools/py/deploy.py @@ -73,7 +73,7 @@ def _get_env_files(services, profile): add(root.joinpath(".env.local")) if profile is not None: if "sparkd" in services or "sparkd-symbols" in services: - profile_dir=root.joinpath("src/server/sparkd/configurations", profile) + profile_dir=root.joinpath("src/app_sparkd/configurations", profile) add(profile_dir.joinpath(".env")) add(profile_dir.joinpath(".env.local")) return files diff --git a/tools/sparkd_profile.sh b/tools/sparkd_profile.sh index a04980769..8ab761650 100755 --- a/tools/sparkd_profile.sh +++ b/tools/sparkd_profile.sh @@ -22,7 +22,7 @@ print_help_and_exit() { } this_dir="$(dirname "${BASH_SOURCE[0]:-$0}")" -profiles_dir="$(realpath "$this_dir/../src/server/sparkd/configurations")" +profiles_dir="$(realpath "$this_dir/../src/app_sparkd/configurations")" declare -r spark_data_dir="${HOME:-/home/bts}/sparkdata" declare -r spark_conf_dir="$spark_data_dir/conf" mkdir -p "$spark_data_dir"