arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-01-13 01:20:58 +00:00
Code Issues Releases Wiki Activity

Handling server disconnect error when docker daemon die

Browse Source 
Fix #985
This commit is contained in:
Julien Duponchelle 2017-04-24 17:37:41 +02:00
parent c9ceeee9de
commit 8b9f22c30c
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,10 +20,10 @@ Docker server module.
""" """
import sys import sys
import json
import asyncio import asyncio
import logging import logging
import aiohttp import aiohttp
import json
from gns3server.utils import parse_version from gns3server.utils import parse_version
from gns3server.utils.asyncio import locked_coroutine from gns3server.utils.asyncio import locked_coroutine
from gns3server.compute.base_manager import BaseManager from gns3server.compute.base_manager import BaseManager
@ -189,7 +189,10 @@ class Docker(BaseManager):
# The pull api will stream status via an HTTP JSON stream # The pull api will stream status via an HTTP JSON stream
content = "" content = ""
while True: while True:
try:
chunk = yield from response.content.read(1024) chunk = yield from response.content.read(1024)
except aiohttp.errors.ServerDisconnectedError:
break
if not chunk: if not chunk:
break break
content += chunk.decode("utf-8") content += chunk.decode("utf-8")