External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-01 06:35:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1426 from chrismeyersfsu/fix-migration_in_progress

Browse Source 
short-circuit middleware if migration loading url
This commit is contained in:
Shane McDonald
2018-03-03 10:48:50 -05:00
committed by GitHub
parent 5370c5e07d 36d59651af
commit d5773c58d3
4 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/settings/defaults.py
View File

@@ -239,6 +239,7 @@ TEMPLATES = [
]
MIDDLEWARE_CLASSES = ( # NOQA
'awx.main.middleware.MigrationRanCheckMiddleware',
'awx.main.middleware.TimingMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.locale.LocaleMiddleware',

2
awx/settings/production.py
View File

@@ -89,8 +89,6 @@ settings_files = os.path.join(settings_dir, '*.py')
settings_file = os.environ.get('AWX_SETTINGS_FILE',
'/etc/tower/settings.py')
MIDDLEWARE_CLASSES = ('awx.main.middleware.MigrationRanCheckMiddleware',) + MIDDLEWARE_CLASSES
# Attempt to load settings from /etc/tower/settings.py first, followed by
# /etc/tower/conf.d/*.py.
try: