diff --git a/src/natlinkcore/config.py b/src/natlinkcore/config.py index e10313b..b2bc36e 100644 --- a/src/natlinkcore/config.py +++ b/src/natlinkcore/config.py @@ -199,6 +199,8 @@ def expand_path(input_path: str) -> str: except ModuleNotFoundError: pass + except Exception as e: + print(f"{__file__} Exception {e} ignored in expand_path{input_path}") env_expanded = expandvars(input_path) # print(f'env_expanded: "{env_expanded}", from envvar: "{input_path}"') diff --git a/src/natlinkcore/natlinkstatus.py b/src/natlinkcore/natlinkstatus.py index 68a3691..a5b6a5a 100644 --- a/src/natlinkcore/natlinkstatus.py +++ b/src/natlinkcore/natlinkstatus.py @@ -109,9 +109,14 @@ # # # natlinkmain = loader.NatlinkMain() ## setting up Logger and Config is needed, when running this for test: -Logger = logging.getLogger('natlink') -Config = config.NatlinkConfig.from_first_found_file(loader.config_locations()) -natlinkmain = loader.NatlinkMain(Logger, Config) +#Logger = logging.getLogger('natlink') + +print(f"Warning code commented out by Doug Dec 31, 2022") +#_config_locations = loader.config_locations() +#Logger.debug(f"{__file__} Configugure {_config_locations}") +#Config = config.NatlinkConfig.from_first_found_file(_config_locations) +#Logger.debug(f"{__file__} Config {Config}") +#natlinkmain = loader.NatlinkMain(Logger, Config) # the possible languages (for get_language), now in loader @@ -142,7 +147,10 @@ class NatlinkStatus(metaclass=singleton.Singleton): def __init__(self): """initialise all instance variables, in this singleton class, (only one instance) """ - self.natlinkmain = natlinkmain # global + Logger = logging.getLogger('natlink') + _config_locations = loader.config_locations() + Config = config.NatlinkConfig.from_first_found_file(_config_locations) + self.natlinkmain = loader.NatlinkMain(Logger,Config) self.DNSVersion = None self.DNSIniDir = None self.NatlinkDirectory = None