Skip to content

Commit

Permalink
Change variable name
Browse files Browse the repository at this point in the history
  • Loading branch information
deecay committed Jun 18, 2019
1 parent abebde3 commit 81e4aed
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion redash/metrics/celery.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions redash/settings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down

0 comments on commit 81e4aed

Please sign in to comment.