Remove duplication in default value & test cleanup

This commit is contained in:
Bruno Alla 2017-11-02 13:50:06 +00:00
parent 49e82ef4ab
commit 829c3364f8
3 changed files with 5 additions and 5 deletions

View File

@ -94,4 +94,4 @@ def test_connection_max_age(cookies):
expected = "DATABASES['default']['CONN_MAX_AGE'] = env.int('CONN_MAX_AGE', default=60)" expected = "DATABASES['default']['CONN_MAX_AGE'] = env.int('CONN_MAX_AGE', default=60)"
assert expected in prod_config_lines, prod_config_lines assert expected in prod_config_lines

View File

@ -169,7 +169,7 @@ TEMPLATES[0]['OPTIONS']['loaders'] = [
('django.template.loaders.cached.Loader', [ ('django.template.loaders.cached.Loader', [
'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', ]), 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', ]),
] ]
{% set _DEFAULT_CONN_MAX_AGE=60 %}
# DATABASE CONFIGURATION # DATABASE CONFIGURATION
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
{% if cookiecutter.use_elasticbeanstalk_experimental.lower() == 'y' -%} {% if cookiecutter.use_elasticbeanstalk_experimental.lower() == 'y' -%}
@ -182,14 +182,14 @@ DATABASES = {
'PASSWORD': env('RDS_PASSWORD'), 'PASSWORD': env('RDS_PASSWORD'),
'HOST': env('RDS_HOSTNAME'), 'HOST': env('RDS_HOSTNAME'),
'PORT': env('RDS_PORT'), 'PORT': env('RDS_PORT'),
'CONN_MAX_AGE': env.int('CONN_MAX_AGE', default=60), 'CONN_MAX_AGE': env.int('CONN_MAX_AGE', default={{ _DEFAULT_CONN_MAX_AGE }}),
} }
} }
{% else %} {% else %}
# Use the Heroku-style specification # Use the Heroku-style specification
# Raises ImproperlyConfigured exception if DATABASE_URL not in os.environ # Raises ImproperlyConfigured exception if DATABASE_URL not in os.environ
DATABASES['default'] = env.db('DATABASE_URL') DATABASES['default'] = env.db('DATABASE_URL')
DATABASES['default']['CONN_MAX_AGE'] = env.int('CONN_MAX_AGE', default=60) DATABASES['default']['CONN_MAX_AGE'] = env.int('CONN_MAX_AGE', default={{ _DEFAULT_CONN_MAX_AGE }})
{%- endif %} {%- endif %}
# CACHING # CACHING

View File

@ -2,7 +2,7 @@
# PostgreSQL # PostgreSQL
POSTGRES_PASSWORD=mysecretpass POSTGRES_PASSWORD=mysecretpass
POSTGRES_USER=postgresuser POSTGRES_USER=postgresuser
CONN_MAX_AGE=60 CONN_MAX_AGE=
# Domain name, used by caddy # Domain name, used by caddy
DOMAIN_NAME={{ cookiecutter.domain_name }} DOMAIN_NAME={{ cookiecutter.domain_name }}