NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-10-24 20:02:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when controller config file is corrupted

Browse Source 
Fix #812
This commit is contained in:
Julien Duponchelle 2016-12-08 10:52:21 +01:00
parent 1d1861fe51
commit bd1560ae50
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gns3server/controller/__init__.py
View File

@ -121,16 +121,16 @@ class Controller:
""" """
Reload the controller configuration from disk Reload the controller configuration from disk
""" """
if not os.path.exists(self._config_file):
yield from self._import_gns3_gui_conf()
self.save()
try: try:
if not os.path.exists(self._config_file):
yield from self._import_gns3_gui_conf()
self.save()
with open(self._config_file) as f: with open(self._config_file) as f:
data = json.load(f) data = json.load(f)
except OSError as e: except (OSError, json.JSONDecodeError) as e:
log.critical("Cannot load %s: %s", self._config_file, str(e)) log.critical("Cannot load %s: %s", self._config_file, str(e))
return return
if "settings" in data: if "settings" in data:
self._settings = data["settings"] self._settings = data["settings"]
if "gns3vm" in data: if "gns3vm" in data: