matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use django-environ for DEBUG and CELERY_ALWAYS_EAGER. Default CELERY_ALWAYS_EAGER to True.

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-04-29 23:47:27 -04:00
parent 3689df4aac
commit 5c83cff767
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mayan/settings/base.py
View File

@@ -37,7 +37,9 @@ SECRET_KEY = DEFAULT_SECRET_KEY
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False
ALLOWED_HOSTS = env.list('MAYAN_ALLOWED_HOSTS', default=['127.0.0.1', 'localhost', '[::1]'])
ALLOWED_HOSTS = env.list(
'MAYAN_ALLOWED_HOSTS', default=['127.0.0.1', 'localhost', '[::1]']
)
# Application definition
@@ -154,7 +156,9 @@ WSGI_APPLICATION = 'mayan.wsgi.application'
# Database
# https://docs.djangoproject.com/en/1.10/ref/settings/#databases
MEDIA_ROOT = os.environ.get('MAYAN_MEDIA_ROOT', os.path.join(BASE_DIR, 'media'))
MEDIA_ROOT = os.environ.get(
'MAYAN_MEDIA_ROOT', os.path.join(BASE_DIR, 'media')
)
DATABASES = {
'default': {
@@ -315,17 +319,13 @@ else:
# Celery
environment_celery_always_eager = os.environ.get('MAYAN_CELERY_ALWAYS_EAGER')
if environment_celery_always_eager == 'True':
CELERY_ALWAYS_EAGER = True
elif environment_celery_always_eager == 'False':
CELERY_ALWAYS_EAGER = False
CELERY_ALWAYS_EAGER = env.bool('MAYAN_CELERY_ALWAYS_EAGER', default=True)
CELERY_RESULT_BACKEND = os.environ.get(
'MAYAN_CELERY_RESULT_BACKEND', 'redis://127.0.0.1:6379/0'
'MAYAN_CELERY_RESULT_BACKEND'
)
BROKER_URL = os.environ.get(
'MAYAN_BROKER_URL', 'redis://127.0.0.1:6379/0'
'MAYAN_BROKER_URL'
)
# Database
@@ -351,8 +351,4 @@ if environment_database_engine:
# Debug
environment_debug = os.environ.get('MAYAN_DEBUG', 'False')
if environment_debug == 'True':
DEBUG = True
elif environment_debug == 'False':
DEBUG = False
DEBUG = env.bool('MAYAN_DEBUG', default=False)