Merge branch '2.0' into 2.1

This commit is contained in:
Julien Duponchelle committed 2017-05-15 15:46:50 +02:00
commit cd17ef6b12
34 files changed
+221 -74

No files matched your search

@@ -112,7 +112,10 @@ class ProjectHandler:
if ProjectHandler._notifications_listening.setdefault(project.id, 0) <= 1:
yield from project.close()
pm.remove_project(project.id)
del ProjectHandler._notifications_listening[project.id]
try:
del ProjectHandler._notifications_listening[project.id]
except KeyError:
pass
else:
log.warning("Skip project closing, another client is listening for project notifications")
response.set_status(204)