arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Code Issues Releases Wiki Activity

Fix a crash in Docker if daemon stop to respond

Browse Source 
Fix #580
This commit is contained in:
Julien Duponchelle 2016-06-20 11:46:10 +02:00
parent f151181409
commit d1de665939
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,14 +101,17 @@ class Docker(BaseManager):
""" """
data = json.dumps(data) data = json.dumps(data)
url = "http://docker/" + path url = "http://docker/" + path
response = yield from aiohttp.request( try:
method, response = yield from aiohttp.request(
url, method,
connector=(yield from self.connector()), url,
params=params, connector=(yield from self.connector()),
data=data, params=params,
headers={"content-type": "application/json", }, 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: if response.status >= 300:
body = yield from response.read() body = yield from response.read()
try: try: