arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-30 18:50:58 +00:00
Code Issues Releases Wiki Activity

Fixes vm concurrency and support for devices.

Browse Source
This commit is contained in:
Jeremy 2015-02-24 15:26:03 -07:00
parent 46b348e46a
commit 6bb7ab20b3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gns3server/web/route.py
View File

@ -159,10 +159,15 @@ class Route(object):
between the same instance of the vm between the same instance of the vm
""" """
if "vm_id" in request.match_info: if "vm_id" in request.match_info or "device_id" in request.match_info:
cls._vms_lock.setdefault(request.match_info["vm_id"], asyncio.Lock()) vm_id = request.match_info.get("vm_id")
with (yield from cls._vms_lock[request.match_info["vm_id"]]): if vm_id is None:
vm_id = request.match_info["device_id"]
cls._vms_lock.setdefault(vm_id, asyncio.Lock())
with (yield from cls._vms_lock[vm_id]):
response = yield from control_schema(request) response = yield from control_schema(request)
else:
response = yield from control_schema(request)
return response return response
cls._routes.append((method, cls._path, vm_concurrency)) cls._routes.append((method, cls._path, vm_concurrency))