diff --git a/gns3server/config.py b/gns3server/config.py index 4b918205..494ac743 100644 --- a/gns3server/config.py +++ b/gns3server/config.py @@ -124,6 +124,9 @@ class Config(object): def list_cloud_config_file(self): return self._cloud_file + def get_config_files(self): + return self._watched_files + def read_cloud_config(self): parsed_file = self._cloud_config.read(self._cloud_file) if not self._cloud_config.has_section(CLOUD_SERVER): diff --git a/gns3server/main.py b/gns3server/main.py index 985e066b..db0a9757 100644 --- a/gns3server/main.py +++ b/gns3server/main.py @@ -143,6 +143,9 @@ def main(): current_year = datetime.date.today().year user_log.info("Copyright (c) 2007-{} GNS3 Technologies Inc.".format(current_year)) + for config_file in Config.instance().get_config_files(): + user_log.info("Config file {} loaded".format(config_file)) + set_config(args) server_config = Config.instance().get_section_config("Server") if server_config.getboolean("local"): diff --git a/gns3server/modules/dynamips/__init__.py b/gns3server/modules/dynamips/__init__.py index 8a339c72..23af464b 100644 --- a/gns3server/modules/dynamips/__init__.py +++ b/gns3server/modules/dynamips/__init__.py @@ -346,7 +346,7 @@ class Dynamips(BaseManager): @asyncio.coroutine def ghost_ios_support(self, vm): - ghost_ios_support = self.config.get_section_config("Dynamips").get("ghost_ios_support", True) + ghost_ios_support = self.config.get_section_config("Dynamips").getboolean("ghost_ios_support", True) if ghost_ios_support: with (yield from Dynamips._ghost_ios_lock): yield from self._set_ghost_ios(vm)