From 81e4aed5b3345306c9c10f6f0b0b989891ddda50 Mon Sep 17 00:00:00 2001 From: deecay Date: Tue, 18 Jun 2019 19:54:02 -0400 Subject: [PATCH] Change variable name --- redash/metrics/celery.py | 2 +- redash/settings/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/redash/metrics/celery.py b/redash/metrics/celery.py index 4f3f2241c0..64cddc963d 100644 --- a/redash/metrics/celery.py +++ b/redash/metrics/celery.py @@ -6,7 +6,7 @@ from redash import settings from celery.concurrency import asynpool -asynpool.PROC_ALIVE_TIMEOUT = settings.CELERY_JOB_TIMEOUT +asynpool.PROC_ALIVE_TIMEOUT = settings.CELERY_INIT_TIMEOUT from celery.signals import task_postrun, task_prerun from redash import settings, statsd_client diff --git a/redash/settings/__init__.py b/redash/settings/__init__.py index ea531c8e37..7e28831091 100644 --- a/redash/settings/__init__.py +++ b/redash/settings/__init__.py @@ -31,8 +31,8 @@ CELERY_RESULT_EXPIRES = int(os.environ.get( "REDASH_CELERY_RESULT_EXPIRES", os.environ.get("REDASH_CELERY_TASK_RESULT_EXPIRES", 3600 * 4))) -CELERY_JOB_TIMEOUT = int(os.environ.get( - "REDASH_CELERY_JOB_TIMEOUT", 10)) +CELERY_INIT_TIMEOUT = int(os.environ.get( + "REDASH_CELERY_INIT_TIMEOUT", 10)) CELERY_BROKER_USE_SSL = CELERY_BROKER.startswith('rediss') CELERY_SSL_CONFIG = { 'ssl_cert_reqs': int(os.environ.get("REDASH_CELERY_BROKER_SSL_CERT_REQS", ssl.CERT_OPTIONAL)),