ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-23 17:17:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '1.5' into 2.0

Browse Source
This commit is contained in:
Julien Duponchelle
2016-06-20 12:45:56 +02:00
parent 3132d51694 d1de665939
commit 6949976d12
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gns3server/compute/docker/__init__.py
View File

@ -100,14 +100,17 @@ class Docker(BaseManager):
"""
data = json.dumps(data)
url = "http://docker/" + path
response = yield from aiohttp.request(
method,
url,
connector=(yield from self.connector()),
params=params,
data=data,
headers={"content-type": "application/json", },
)
try:
response = yield from aiohttp.request(
method,
url,
connector=(yield from self.connector()),
params=params,
data=data,
headers={"content-type": "application/json", },
)
except aiohttp.ClientResponseError as e:
raise DockerError("Docker has returned an error: {}".format(str(e)))
if response.status >= 300:
body = yield from response.read()
try: