From 8b9f22c30c154c5508caeb2b9ee16347d09d929d Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Mon, 24 Apr 2017 17:37:41 +0200 Subject: [PATCH] Handling server disconnect error when docker daemon die Fix #985 --- gns3server/compute/docker/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gns3server/compute/docker/__init__.py b/gns3server/compute/docker/__init__.py index bd74f361d..3a70b2825 100644 --- a/gns3server/compute/docker/__init__.py +++ b/gns3server/compute/docker/__init__.py @@ -20,10 +20,10 @@ Docker server module. """ import sys +import json import asyncio import logging import aiohttp -import json from gns3server.utils import parse_version from gns3server.utils.asyncio import locked_coroutine 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 content = "" while True: - chunk = yield from response.content.read(1024) + try: + chunk = yield from response.content.read(1024) + except aiohttp.errors.ServerDisconnectedError: + break if not chunk: break content += chunk.decode("utf-8")