Merge branch '2.0' into 2.1

8 years ago · 583327ad33
parent 1ab9ca2333 7e1e63cd09
commit 583327ad33
1 changed files with 4 additions and 1 deletions
--- a/gns3server/handlers/api/controller/server_handler.py
+++ b/gns3server/handlers/api/controller/server_handler.py
@ -114,7 +114,10 @@ class ServerHandler:
    def write_settings(request, response):
        controller = Controller.instance()
        controller.settings = request.json
-        controller.save()
+        try:
+            controller.save()
+        except (OSError, PermissionError) as e:
+            raise HTTPConflict(text="Can't save the settings {}".format(str(e)))
        response.json(controller.settings)
        response.set_status(201)