From 54e2ee762b04d696639db80d3b1badc4dca72d5a Mon Sep 17 00:00:00 2001 From: streino Date: Thu, 31 Oct 2024 18:19:23 +0100 Subject: [PATCH 1/2] Disable rq job timeout --- isomorphe/app.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/isomorphe/app.py b/isomorphe/app.py index a838922..3e49e5c 100644 --- a/isomorphe/app.py +++ b/isomorphe/app.py @@ -34,7 +34,9 @@ app = Flask(__name__) app.config["SECRET_KEY"] = os.getenv("FLASK_SECRET_KEY", "default-secret-key") +app.config["TRANSFORM_TIMEOUT"] = -1 # no timeout app.config["TRANSFORM_TTL"] = 60 * 60 * 24 * 7 * 30 * 2 # 2 months +app.config["MIGRATE_TIMEOUT"] = -1 # no timeout app.config["MIGRATE_TTL"] = 60 * 60 * 24 * 7 * 30 * 2 # 2 months app.config["TRANSFORMATIONS_PATH"] = ( Path(os.getenv("TRANSFORMATIONS_PATH", "")) @@ -137,6 +139,7 @@ def transform(): transformation, selection, transformation_params=transformation_params, + job_timeout=app.config["TRANSFORM_TIMEOUT"], result_ttl=app.config["TRANSFORM_TTL"], ) return redirect(url_for("transform_success", job_id=job.id)) @@ -244,6 +247,7 @@ def migrate(job_id: str): transform_job.result, overwrite=overwrite, group=group, + job_timeout=app.config["MIGRATE_TIMEOUT"], result_ttl=app.config["MIGRATE_TTL"], transform_job_id=job_id, ) From 979f01045e9414b659f8ca506b4171e8d2453957 Mon Sep 17 00:00:00 2001 From: streino <30210525+streino@users.noreply.github.com> Date: Sat, 2 Nov 2024 14:11:15 +0100 Subject: [PATCH 2/2] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexandre Bulté --- isomorphe/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/isomorphe/app.py b/isomorphe/app.py index 3e49e5c..ca11c62 100644 --- a/isomorphe/app.py +++ b/isomorphe/app.py @@ -34,9 +34,9 @@ app = Flask(__name__) app.config["SECRET_KEY"] = os.getenv("FLASK_SECRET_KEY", "default-secret-key") -app.config["TRANSFORM_TIMEOUT"] = -1 # no timeout +app.config["TRANSFORM_TIMEOUT"] = 3*60*60 # 3 hours app.config["TRANSFORM_TTL"] = 60 * 60 * 24 * 7 * 30 * 2 # 2 months -app.config["MIGRATE_TIMEOUT"] = -1 # no timeout +app.config["MIGRATE_TIMEOUT"] = 3*60*60 # 3 hours app.config["MIGRATE_TTL"] = 60 * 60 * 24 * 7 * 30 * 2 # 2 months app.config["TRANSFORMATIONS_PATH"] = ( Path(os.getenv("TRANSFORMATIONS_PATH", ""))