Merge branch '2.0' into 2.1

This commit is contained in:
Julien Duponchelle committed 2017-02-28 14:32:40 +01:00
commit 583327ad33
1 file changed
+4 -1
@@ -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)