NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-06 07:11:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanly forward exception from compute to controller

Browse Source
This commit is contained in:
Julien Duponchelle committed 2016-06-07 16:06:37 +02:00
1 parent d8bdd16e13
commit 972cbd0594
2 files changed
+14 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/web/route.py
+3 -3
View File
@@ -25,7 +25,7 @@ import traceback
log = logging.getLogger(__name__)
from ..compute.error import NodeError
from ..compute.error import NodeError, ImageMissingError
from ..controller.controller_error import ControllerError
from ..ubridge.ubridge_error import UbridgeError
from .response import Response
@@ -198,10 +198,10 @@ class Route(object):
response.set_status(409)
response.json({"message": str(e), "status": 409})
except (NodeError, UbridgeError, ImageMissingError) as e:
log.error("Node error detected: {type}".format(type=type(e)), exc_info=1)
log.error("Node error detected: {type}".format(type=e.__class__.__name__), exc_info=1)
response = Response(request=request, route=route)
response.set_status(409)
response.json({"message": str(e), "status": 409, "exception": str(e.__class__)})
response.json({"message": str(e), "status": 409, "exception": e.__class__.__name__})
except asyncio.futures.CancelledError as e:
log.error("Request canceled")
response = Response(request=request, route=route)