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

Merge branch '2.0' into 2.1

Browse Source
This commit is contained in:
Julien Duponchelle 2017-02-28 14:32:40 +01:00
commit 583327ad33
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/handlers/api/controller/server_handler.py
View File

@ -114,7 +114,10 @@ class ServerHandler:
def write_settings(request, response): def write_settings(request, response):
controller = Controller.instance() controller = Controller.instance()
controller.settings = request.json controller.settings = request.json
try:
controller.save() controller.save()
except (OSError, PermissionError) as e:
raise HTTPConflict(text="Can't save the settings {}".format(str(e)))
response.json(controller.settings) response.json(controller.settings)
response.set_status(201) response.set_status(201)