NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-18 07:23:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some info message and fixes ghost IOS activation/deactivation.

Browse Source
This commit is contained in:
Jeremy 2015-02-27 19:35:31 -07:00
parent 84870bf736
commit ba95567886
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/config.py
View File

@ -124,6 +124,9 @@ class Config(object):
def list_cloud_config_file(self): def list_cloud_config_file(self):
return self._cloud_file return self._cloud_file
def get_config_files(self):
return self._watched_files
def read_cloud_config(self): def read_cloud_config(self):
parsed_file = self._cloud_config.read(self._cloud_file) parsed_file = self._cloud_config.read(self._cloud_file)
if not self._cloud_config.has_section(CLOUD_SERVER): if not self._cloud_config.has_section(CLOUD_SERVER):

3
gns3server/main.py
View File

@ -143,6 +143,9 @@ def main():
current_year = datetime.date.today().year current_year = datetime.date.today().year
user_log.info("Copyright (c) 2007-{} GNS3 Technologies Inc.".format(current_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) set_config(args)
server_config = Config.instance().get_section_config("Server") server_config = Config.instance().get_section_config("Server")
if server_config.getboolean("local"): if server_config.getboolean("local"):

2
gns3server/modules/dynamips/__init__.py
View File

@ -346,7 +346,7 @@ class Dynamips(BaseManager):
@asyncio.coroutine @asyncio.coroutine
def ghost_ios_support(self, vm): 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: if ghost_ios_support:
with (yield from Dynamips._ghost_ios_lock): with (yield from Dynamips._ghost_ios_lock):
yield from self._set_ghost_ios(vm) yield from self._set_ghost_ios(vm)