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

Raise an error if server flagged as local but should not

Browse Source 
If the controller is not started with --local but the server ID
is local it's raise an error.
This commit is contained in:
Julien Duponchelle
2016-03-04 16:11:31 +01:00
parent aad69e9650
commit 4d77b2918e
5 changed files with 68 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/web/route.py
View File

@ -26,6 +26,7 @@ import traceback
log = logging.getLogger(__name__)
from ..modules.vm_error import VMError
from ..controller.controller_error import ControllerError
from ..ubridge.ubridge_error import UbridgeError
from .response import Response
from ..crash_report import CrashReport
@ -185,6 +186,11 @@ class Route(object):
response = Response(request=request, route=route)
response.set_status(e.status)
response.json({"message": e.text, "status": e.status})
except (ControllerError) as e:
log.error("Controller error detected: {type}".format(type=type(e)), exc_info=1)
response = Response(request=request, route=route)
response.set_status(409)
response.json({"message": str(e), "status": 409})
except (VMError, UbridgeError) as e:
log.error("VM error detected: {type}".format(type=type(e)), exc_info=1)
response = Response(request=request, route=route)