From c76fd8388a1d0c0015302396613ce85363643c39 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Tue, 15 Apr 2025 17:16:48 +0200 Subject: [PATCH] refs #1908 remove refs to OGLOG --- CHANGELOG.md | 6 ++++++ ogclient/lib/python3/ogGlobals.py | 5 ++--- ogclient/scripts/listHardwareInfo.py | 2 +- ogclient/scripts/listSoftwareInfo.py | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64f5aea..1ec917e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.7.0] - 2025-04-15 + +### Removed + +- Removed references to ogGlobals.OGLOG in python code + ## [0.6.1] - 2025-04-15 ### Fixed diff --git a/ogclient/lib/python3/ogGlobals.py b/ogclient/lib/python3/ogGlobals.py index c212c9e..f1901fd 100644 --- a/ogclient/lib/python3/ogGlobals.py +++ b/ogclient/lib/python3/ogGlobals.py @@ -61,9 +61,8 @@ 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 = '/var/log' -OGLOGFILE = f'{OGLOG}/clone-engine.log' -OGJSONLOGFILE = f'{OGLOG}/clone-engine.json.log' +OGLOGFILE = '/var/log/clone-engine.log' +OGJSONLOGFILE = '/var/log/clone-engine.json.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]) diff --git a/ogclient/scripts/listHardwareInfo.py b/ogclient/scripts/listHardwareInfo.py index d702212..5993f07 100755 --- a/ogclient/scripts/listHardwareInfo.py +++ b/ogclient/scripts/listHardwareInfo.py @@ -21,7 +21,7 @@ if len (sys.argv) > 1: #SERVERLOGDIR = unused # Fichero de listado: hard-IP -HARDFILE = f'{ogGlobals.OGLOG}/hard-{ogGetIpAddress()}' +HARDFILE = f'/tmp/hard-{ogGetIpAddress()}' out = ogListHardwareInfo() with open (HARDFILE, 'w') as fd: fd.write (out) diff --git a/ogclient/scripts/listSoftwareInfo.py b/ogclient/scripts/listSoftwareInfo.py index 1c2756e..f92cdbd 100755 --- a/ogclient/scripts/listSoftwareInfo.py +++ b/ogclient/scripts/listSoftwareInfo.py @@ -18,7 +18,7 @@ prog = os.path.basename (sys.argv[0]) def main (disk, par, reduced): ip = NetLib.ogGetIpAddress() - softfile = f'{ogGlobals.OGLOG}/soft-{ip}-{disk}-{par}' + softfile = f'/tmp/soft-{ip}-{disk}-{par}' software_list = InventoryLib.ogListSoftware (disk, par) if reduced: