From 0c90393b5b79f9ab2c7e42b100f0a09096c4c548 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sun, 1 Feb 2015 16:55:08 -0700 Subject: [PATCH] Send explicit error message when client is checking for the server version. --- gns3server/handlers/version_handler.py | 7 ++++--- gns3server/schemas/version.py | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gns3server/handlers/version_handler.py b/gns3server/handlers/version_handler.py index abdb43c5..6d020967 100644 --- a/gns3server/handlers/version_handler.py +++ b/gns3server/handlers/version_handler.py @@ -29,7 +29,7 @@ class VersionHandler: description="Retrieve the server version number", output=VERSION_SCHEMA) def version(request, response): - response.json({'version': __version__}) + response.json({"version": __version__}) @classmethod @Route.post( @@ -43,5 +43,6 @@ class VersionHandler: }) def check_version(request, response): if request.json["version"] != __version__: - raise HTTPConflict(reason="Invalid version") - response.json({'version': __version__}) + raise HTTPConflict(text="Client version {} differs with server version {}".format(request.json["version"], + __version__)) + response.json({"version": __version__}) diff --git a/gns3server/schemas/version.py b/gns3server/schemas/version.py index bf9d41f4..127084df 100644 --- a/gns3server/schemas/version.py +++ b/gns3server/schemas/version.py @@ -24,7 +24,6 @@ VERSION_SCHEMA = { "version": { "description": "Version number human readable", "type": "string", - "minLength": 5, } } }