Fix templates missing after server restart. Fixes GNS3/gns3-gui#2769

GNS3 · Apr 14, 2019 · 6dbb992 · 6dbb992
1 parent e962717
commit 6dbb992
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/gns3server/config.py b/gns3server/config.py
@@ -131,14 +131,15 @@ def __init__(self, files=None, profile=None):
             try:
                 # migrate the server config file
                 old_server_config = os.path.join(legacy_user_dir, server_filename)
-                if os.path.exists(old_server_config):
-                    new_server_config = os.path.join(versioned_user_dir, server_filename)
+                new_server_config = os.path.join(versioned_user_dir, server_filename)
+                if not os.path.exists(new_server_config) and os.path.exists(old_server_config):
                     shutil.copyfile(old_server_config, new_server_config)
 
                 # migrate the controller config file
                 old_controller_config = os.path.join(legacy_user_dir, controller_filename)
-                if os.path.exists(old_controller_config):
-                    shutil.copyfile(old_controller_config, os.path.join(versioned_user_dir, controller_filename))
+                new_controller_config = os.path.join(versioned_user_dir, controller_filename)
+                if not os.path.exists(new_controller_config) and os.path.exists(old_controller_config):
+                    shutil.copyfile(old_controller_config, os.path.join(versioned_user_dir, new_controller_config))
             except OSError as e:
                 log.error("Cannot migrate old config files: {}".format(e))
 

diff --git a/gns3server/controller/__init__.py b/gns3server/controller/__init__.py
@@ -128,6 +128,7 @@ async def stop(self):
             except (ComputeError, aiohttp.web.HTTPError, OSError):
                 pass
         await self.gns3vm.exit_vm()
+        self.save()
         self._computes = {}
         self._projects = {}