NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-19 07:53:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue when loading and quickly closing a project and opening it again. Fixes #1501.

Browse Source
This commit is contained in:
grossmj 2019-03-14 15:15:27 +07:00
parent a059e6b943
commit 7d591b0228
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gns3server/controller/project.py
View File

@ -94,6 +94,7 @@ class Project:
self._supplier = supplier self._supplier = supplier
self._loading = False self._loading = False
self._closing = False
# Disallow overwrite of existing project # Disallow overwrite of existing project
if project_id is None and path is not None: if project_id is None and path is not None:
@ -743,12 +744,14 @@ class Project:
del self._snapshots[snapshot.id] del self._snapshots[snapshot.id]
os.remove(snapshot.path) os.remove(snapshot.path)
@locking
async def close(self, ignore_notification=False): async def close(self, ignore_notification=False):
if self._status == "closed": if self._status == "closed" or self._closing:
return return
if self._loading: if self._loading:
log.warning("Closing project '{}' ignored because it is being loaded".format(self.name)) log.warning("Closing project '{}' ignored because it is being loaded".format(self.name))
return return
self._closing = True
await self.stop_all() await self.stop_all()
for compute in list(self._project_created_on_compute): for compute in list(self._project_created_on_compute):
try: try:
@ -761,6 +764,7 @@ class Project:
if not ignore_notification: if not ignore_notification:
self.emit_notification("project.closed", self.__json__()) self.emit_notification("project.closed", self.__json__())
self.reset() self.reset()
self._closing = False
def _clean_pictures(self): def _clean_pictures(self):
""" """
@ -843,6 +847,10 @@ class Project:
""" """
Load topology elements Load topology elements
""" """
if self._closing is True:
raise aiohttp.web.HTTPConflict(text="Project is closing, please try again in a few seconds...")
if self._status == "opened": if self._status == "opened":
return return