From 2f4ade71ddcf57b73710e60fa5785fdf4b5d8266 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Mon, 18 Nov 2024 09:36:29 +0100 Subject: [PATCH] refs #1112 avoid KeyErrors --- src/opengnsys/modules/server/OpenGnSys/__init__.py | 10 +++++----- src/opengnsys/workers/oglive_worker.py | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/opengnsys/modules/server/OpenGnSys/__init__.py b/src/opengnsys/modules/server/OpenGnSys/__init__.py index 6b63be0..b614cb2 100644 --- a/src/opengnsys/modules/server/OpenGnSys/__init__.py +++ b/src/opengnsys/modules/server/OpenGnSys/__init__.py @@ -117,11 +117,11 @@ class OpenGnSysWorker(ServerWorker): self.random = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(self.length)) # Ensure cfg has required configuration variables or an exception will be thrown - ogcore_scheme = os.environ['OGAGENTCFG_OGCORE_SCHEME'] or 'https' - ogcore_ip = os.environ['OGAGENTCFG_OGCORE_IP'] or '192.168.2.1' - ogcore_port = os.environ['OGAGENTCFG_OGCORE_PORT'] or '8443' - ogcore_altip = os.environ['OGAGENTCFG_OGCORE_ALTIP'] or '192.168.2.254' - ogcore_altport = os.environ['OGAGENTCFG_OGCORE_ALTPORT'] or '8443' + ogcore_scheme = os.environ.get ('OGAGENTCFG_OGCORE_SCHEME', 'https') + ogcore_ip = os.environ.get ('OGAGENTCFG_OGCORE_IP', '192.168.2.1') + ogcore_port = os.environ.get ('OGAGENTCFG_OGCORE_PORT', '8443') + ogcore_altip = os.environ.get ('OGAGENTCFG_OGCORE_ALTIP', '192.168.2.254') + ogcore_altport = os.environ.get ('OGAGENTCFG_OGCORE_ALTPORT', '8443') ogcore_ip_port = ':'.join (map (str, filter (None, [ogcore_ip, ogcore_port ]))) ogcore_altip_port = ':'.join (map (str, filter (None, [ogcore_altip, ogcore_altport ]))) try: diff --git a/src/opengnsys/workers/oglive_worker.py b/src/opengnsys/workers/oglive_worker.py index 1800a24..01dd0c4 100644 --- a/src/opengnsys/workers/oglive_worker.py +++ b/src/opengnsys/workers/oglive_worker.py @@ -366,12 +366,12 @@ class ogLiveWorker(ServerWorker): self.idaula = None ## Identificador del aula self.q = None ## for passing PIDs around - ogcore_scheme = os.environ['OGAGENTCFG_OGCORE_SCHEME'] or 'https' - ogcore_ip = os.environ['OGAGENTCFG_OGCORE_IP'] or '192.168.2.1' - ogcore_port = os.environ['OGAGENTCFG_OGCORE_PORT'] or '8443' - urlmenu_scheme = os.environ['OGAGENTCFG_URLMENU_SCHEME'] or 'https' - urlmenu_ip = os.environ['OGAGENTCFG_URLMENU_IP'] or '192.168.2.1' - urlmenu_port = os.environ['OGAGENTCFG_URLMENU_PORT'] or '8443' + ogcore_scheme = os.environ.get ('OGAGENTCFG_OGCORE_SCHEME', 'https') + ogcore_ip = os.environ.get ('OGAGENTCFG_OGCORE_IP', '192.168.2.1') + ogcore_port = os.environ.get ('OGAGENTCFG_OGCORE_PORT', '8443') + urlmenu_scheme = os.environ.get ('OGAGENTCFG_URLMENU_SCHEME', 'https') + urlmenu_ip = os.environ.get ('OGAGENTCFG_URLMENU_IP', '192.168.2.1') + urlmenu_port = os.environ.get ('OGAGENTCFG_URLMENU_PORT', '8443') ogcore_ip_port = ':'.join (map (str, filter (None, [ogcore_ip, ogcore_port ]))) urlmenu_ip_port = ':'.join (map (str, filter (None, [urlmenu_ip, urlmenu_port]))) try: