mirror of
https://github.com/GNS3/gns3-server
synced 2024-12-24 15:58:08 +00:00
Explicitly close VM when the server is shutdown.
This commit is contained in:
parent
e61e976368
commit
0d503b779e
@ -94,12 +94,17 @@ class BaseManager:
|
||||
|
||||
return self._config
|
||||
|
||||
@classmethod
|
||||
@asyncio.coroutine
|
||||
def unload(cls):
|
||||
def unload(self):
|
||||
|
||||
# TODO: close explicitly all the VMs here?
|
||||
cls._instance = None
|
||||
for uuid in self._vms.keys():
|
||||
try:
|
||||
self.delete_vm(uuid)
|
||||
except Exception as e:
|
||||
log.warn("Could not delete VM {}: {}".format(uuid, e))
|
||||
|
||||
if hasattr(BaseManager, "_instance"):
|
||||
BaseManager._instance = None
|
||||
|
||||
def get_vm(self, uuid):
|
||||
"""
|
||||
@ -144,6 +149,8 @@ class BaseManager:
|
||||
self._vms[vm.uuid] = vm
|
||||
return vm
|
||||
|
||||
# FIXME: should be named close_vm and we should have a
|
||||
# delete_vm when a user deletes a VM (including files in workdir)
|
||||
@asyncio.coroutine
|
||||
def delete_vm(self, uuid):
|
||||
"""
|
||||
|
@ -68,7 +68,8 @@ def server(request, loop, port_manager):
|
||||
|
||||
def tear_down():
|
||||
for module in MODULES:
|
||||
loop.run_until_complete(module.unload())
|
||||
instance = module.instance()
|
||||
loop.run_until_complete(instance.unload())
|
||||
srv.close()
|
||||
srv.wait_closed()
|
||||
request.addfinalizer(tear_down)
|
||||
|
Loading…
Reference in New Issue
Block a user