p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[2.2.x] Refs #30323 -- Prevented crash of autoreloader when get_resolver().urlconf_module raising an exception. 

Backport of 0636d4d2aa from master
This commit is contained in:
Tom Forbes 2019-04-29 10:22:43 +02:00 committed by Mariusz Felisiak
parent 4f8ebdd098
commit 097457afe4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/utils/autoreload.py
View File

@ -269,7 +269,12 @@ class BaseReloader:
from django.urls import get_resolver from django.urls import get_resolver
# Prevent a race condition where URL modules aren't loaded when the # Prevent a race condition where URL modules aren't loaded when the
# reloader starts by accessing the urlconf_module property. # reloader starts by accessing the urlconf_module property.
get_resolver().urlconf_module try:
get_resolver().urlconf_module
except Exception:
# Loading the urlconf can result in errors during development.
# If this occurs then swallow the error and continue.
pass
logger.debug('Apps ready_event triggered. Sending autoreload_started signal.') logger.debug('Apps ready_event triggered. Sending autoreload_started signal.')
autoreload_started.send(sender=self) autoreload_started.send(sender=self)
self.run_loop() self.run_loop()

3
docs/releases/2.2.1.txt
View File

@ -64,3 +64,6 @@ Bugfixes
permissions for proxy models if the target permissions already existed. For permissions for proxy models if the target permissions already existed. For
example, when a permission had been created manually or a model had been example, when a permission had been created manually or a model had been
migrated from concrete to proxy (:ticket:`30351`). migrated from concrete to proxy (:ticket:`30351`).
* Fixed a regression in Django 2.2 that caused a crash of :djadmin:`runserver`
when URLConf modules raised exceptions (:ticket:`30323`).