From 84d963ea1e7635d83493ae571ffd196800d8f01f Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 31 Jan 2024 13:17:19 +0100 Subject: [PATCH 1/2] setup 'AYON_SITE_ID' in boot --- start.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/start.py b/start.py index e6745b82c..3cfc90bf6 100644 --- a/start.py +++ b/start.py @@ -289,14 +289,12 @@ def _print(message: str): set_default_settings_variant, get_addons_studio_settings, ) -from ayon_api.constants import SERVER_URL_ENV_KEY, SERVER_API_ENV_KEY -# Kept for backwards compatibility of older ayon-python-api in case older -# is used. -try: - from ayon_api.constants import DEFAULT_VARIANT_ENV_KEY -except ImportError: - DEFAULT_VARIANT_ENV_KEY = "AYON_DEFAULT_SETTINGS_VARIANT" - +from ayon_api.constants import ( + SERVER_URL_ENV_KEY, + SERVER_API_ENV_KEY, + DEFAULT_VARIANT_ENV_KEY, + SITE_ID_ENV_KEY, +) from ayon_common import is_staging_enabled, is_dev_mode_enabled from ayon_common.connection.credentials import ( ask_to_login_ui, @@ -315,7 +313,10 @@ def _print(message: str): UpdateWindowManager, ) -from ayon_common.utils import store_current_executable_info +from ayon_common.utils import ( + store_current_executable_info, + get_local_site_id, +) from ayon_common.startup import show_startup_error @@ -644,6 +645,10 @@ def _start_distribution(): def boot(): """Bootstrap AYON.""" + # Setup site id in environment variable for all possible subprocesses + if SITE_ID_ENV_KEY not in os.environ: + os.environ[SITE_ID_ENV_KEY] = get_local_site_id() + _connect_to_ayon_server() create_global_connection() _start_distribution() From 1bbf3507ffb34ade092704c1df2360b3cdabd5b6 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 31 Jan 2024 13:17:48 +0100 Subject: [PATCH 2/2] use 'SITE_ID_ENV_KEY' constant in utils --- common/ayon_common/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/ayon_common/utils.py b/common/ayon_common/utils.py index 1bbed7942..2d3cad6b0 100644 --- a/common/ayon_common/utils.py +++ b/common/ayon_common/utils.py @@ -9,6 +9,7 @@ from uuid import UUID import appdirs +from ayon_api.constants import SITE_ID_ENV_KEY DATE_FMT = "%Y-%m-%d %H:%M:%S" CLEANUP_INTERVAL = 2 # days @@ -85,7 +86,7 @@ def get_local_site_id(): """ # used for background syncing - site_id = os.environ.get("AYON_SITE_ID") + site_id = os.environ.get(SITE_ID_ENV_KEY) if site_id: return site_id