Skip to content

Remove org check from sync app #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Remove org check from sync app #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f5e043
Remove org initialization in sync app
amoghjalan Apr 23, 2024
ccc5bdf
Add check if default org exists
amoghjalan Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions backend/analytics_server/mhq/service/sync_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from mhq.service.merge_to_deploy_broker import process_merge_to_deploy_cache
from mhq.service.query_validator import get_query_validator
from mhq.service.workflows import sync_org_workflows
from mhq.utils.lock import get_redis_lock_service
from mhq.utils.log import LOG

sync_sequence = [
Expand All @@ -13,11 +14,8 @@
]


def trigger_data_sync():
default_org = get_query_validator().get_default_org()
org_id = str(default_org.id)
def trigger_data_sync(org_id: str):
LOG.info(f"Starting data sync for org {org_id}")

for sync_func in sync_sequence:
try:
sync_func(org_id)
Expand All @@ -31,4 +29,12 @@ def trigger_data_sync():


if __name__ == "__main__":
trigger_data_sync()
default_org = get_query_validator().get_default_org()
if not default_org:
raise Exception("Default org not found")
org_id = str(default_org.id)
with get_redis_lock_service().acquire_lock("{org}:" + f"{str(org_id)}:data_sync"):
try:
trigger_data_sync(org_id)
except Exception as e:
LOG.error(f"Error syncing data for org {org_id}: {str(e)}")
3 changes: 0 additions & 3 deletions backend/analytics_server/sync_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
from mhq.api.hello import app as core_api
from mhq.api.sync import app as sync_api

from mhq.store.initialise_db import initialize_database

SYNC_SERVER_PORT = getenv("SYNC_SERVER_PORT")

app = Flask(__name__)
Expand All @@ -20,7 +18,6 @@
app.register_blueprint(sync_api)

configure_db_with_app(app)
initialize_database(app)

if __name__ == "__main__":
app.run(port=SYNC_SERVER_PORT)