opengnsys
/
ogagent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #1112 avoid KeyErrors

ogcore1
Natalia Serrano 2024-11-18 09:36:29 +01:00
parent 9ac107dde4
commit 2f4ade71dd
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/opengnsys/modules/server/OpenGnSys/__init__.py
View File

@ -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:

12
src/opengnsys/workers/oglive_worker.py
View File

@ -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: