From 5845a8d13c0712ed1e925f8e99848ea73741bbf1 Mon Sep 17 00:00:00 2001 From: Bulat Kurbanov Date: Tue, 9 Aug 2022 17:27:31 +0300 Subject: [PATCH] Update tasks --- src/app/services/updaters/fl_updater.py | 24 ++++++++++++------------ src/core/setup_arq.py | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/app/services/updaters/fl_updater.py b/src/app/services/updaters/fl_updater.py index 1e6f55a..3b41893 100644 --- a/src/app/services/updaters/fl_updater.py +++ b/src/app/services/updaters/fl_updater.py @@ -112,7 +112,7 @@ async def update_fl_authors(ctx: dict, *args, prefix: Optional[str] = None, **kw ) if not is_deps_complete: - raise Retry(defer=60 * not_complete_count) + raise Retry(defer=45 * not_complete_count) postgres, mysql = await get_db_cons() @@ -169,7 +169,7 @@ async def update_fl_books(ctx: dict, *args, prefix: Optional[str] = None, **kwar ) if not is_deps_complete: - raise Retry(defer=60 * not_complete_count) + raise Retry(defer=45 * not_complete_count) postgres, mysql = await get_db_cons() @@ -246,7 +246,7 @@ async def update_fl_books_authors( ) if not is_deps_complete: - raise Retry(defer=60 * not_complete_count) + raise Retry(defer=45 * not_complete_count) postgres, mysql = await get_db_cons() @@ -301,7 +301,7 @@ async def update_fl_translations( ) if not is_deps_complete: - raise Retry(defer=60 * not_complete_count) + raise Retry(defer=45 * not_complete_count) postgres, mysql = await get_db_cons() @@ -357,7 +357,7 @@ async def update_fl_sequences(ctx: dict, *args, prefix: Optional[str] = None, ** ) if not is_deps_complete: - raise Retry(defer=60 * not_complete_count) + raise Retry(defer=45 * not_complete_count) postgres, mysql = await get_db_cons() @@ -414,7 +414,7 @@ async def update_fl_sequences_info( ) if not is_deps_complete: - raise Retry(defer=60 * not_complete_count) + raise Retry(defer=45 * not_complete_count) postgres, mysql = await get_db_cons() @@ -474,7 +474,7 @@ async def update_fl_book_annotations( ) if not is_deps_complete: - raise Retry(defer=60 * not_complete_count) + raise Retry(defer=45 * not_complete_count) postgres, mysql = await get_db_cons() @@ -538,7 +538,7 @@ async def update_fl_book_annotations_pic( ) if not is_deps_complete: - raise Retry(defer=60 * not_complete_count) + raise Retry(defer=45 * not_complete_count) postgres, mysql = await get_db_cons() @@ -578,7 +578,7 @@ async def update_fl_author_annotations( ) if not is_deps_complete: - raise Retry(defer=60 * not_complete_count) + raise Retry(defer=45 * not_complete_count) postgres, mysql = await get_db_cons() @@ -674,7 +674,7 @@ async def update_fl_genres(ctx: dict, *args, prefix: Optional[str] = None, **kwa ) if not is_deps_complete: - raise Retry(defer=60 * not_complete_count) + raise Retry(defer=45 * not_complete_count) postgres, mysql = await get_db_cons() @@ -730,7 +730,7 @@ async def update_fl_books_genres( ) if not is_deps_complete: - raise Retry(defer=60 * not_complete_count) + raise Retry(defer=45 * not_complete_count) postgres, mysql = await get_db_cons() @@ -782,7 +782,7 @@ async def update_fl_webhook( ) if not is_deps_complete: - raise Retry(defer=60 * not_complete_count) + raise Retry(defer=45 * not_complete_count) all_success = True diff --git a/src/core/setup_arq.py b/src/core/setup_arq.py index f34ec11..83bb94f 100644 --- a/src/core/setup_arq.py +++ b/src/core/setup_arq.py @@ -24,6 +24,6 @@ class WorkerSettings: on_shutdown = shutdown redis_settings = get_redis_settings() max_jobs = 2 - max_tries = 20 - job_timeout = 5 * 60 + max_tries = 30 + job_timeout = 10 * 60 cron_jobs = [cron(run_fl_update, hour={5}, minute=0)]