From fb0d52073900bcdb0b7ef41ae666fb3ac888ff01 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Thu, 6 Mar 2025 11:07:53 +0100 Subject: [PATCH] refs #1633 unhardcode IP address in OGLOGFILE --- ogclient/lib/python3/ogGlobals.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ogclient/lib/python3/ogGlobals.py b/ogclient/lib/python3/ogGlobals.py index 29eea03..c744b2c 100644 --- a/ogclient/lib/python3/ogGlobals.py +++ b/ogclient/lib/python3/ogGlobals.py @@ -6,6 +6,10 @@ import os.path import locale import importlib.util +## required for defining OGLOGFILE +import NetLib +ip = NetLib.ogGetIpAddress() + def load_lang (name): global lang if name in sys.modules: @@ -57,11 +61,12 @@ OGBIN = os.path.join (OPENGNSYS, 'bin') OGETC = os.path.join (OPENGNSYS, 'etc') OGLIB = os.path.join (OPENGNSYS, 'lib') OGAPI = os.path.join (OGLIB, 'engine', 'bin') +OGPYFUNCS = os.path.join (OPENGNSYS, 'functions') OGSCRIPTS = os.path.join (OPENGNSYS, 'scripts') OGIMG = os.path.join (OPENGNSYS, 'images') OGCAC = os.path.join (OPENGNSYS, 'cache') OGLOG = os.path.join (OPENGNSYS, 'log') -OGLOGFILE = f'{OGLOG}/192.168.42.42' ## TODO import NetLib; OGLOGFILE = f'$OGLOG/{NetLib.ogGetIpAddress()}.log' +OGLOGFILE = f'{OGLOG}/{ip}.log' DEBUG = 'yes' _path = os.environ['PATH'] + ':/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin:/opt/oglive/rootfs/opt/drbl/sbin' os.environ['PATH'] = ':'.join ([OGSCRIPTS, _path, OGAPI, OGBIN])