CHANGELOG.md

@@ -6,6 +6,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).
 
+## [7.2.0] - 2025-07-28
+
+### Added
+
+- Log whether we are in ogLive or not
+
 ## [7.1.0] - 2025-07-24
 
 ### Changed

linux/debian/changelog

@@ -1,3 +1,9 @@
+ogagent (7.2.0-1) stable; urgency=medium
+
+  * Log whether we are in ogLive or not
+
+ -- OpenGnsys developers <info@opengnsys.es>  Mon, 28 Jul 2025 13:55:28 +0200
+
 ogagent (7.1.0-1) stable; urgency=medium
 
   * Don't pass the "tag" parameter to CrearImagenGit

src/VERSION

@@ -1 +1 @@
-7.1.0
+7.2.0

src/opengnsys/linux/log.py

@@ -42,6 +42,8 @@ OTHER, DEBUG, INFO, WARN, ERROR, FATAL = (10000 * (x + 1) for x in range(6))
 
 class LocalLogger(object):
     def __init__(self):
+        self.extra = { 'in_oglive': None }
+
         # tempdir is different for "user application" and "service"
         # service wil get c:\windows\temp, while user will get c:\users\XXX\temp
         # Try to open logger at /var/log path
@@ -51,13 +53,13 @@ class LocalLogger(object):
         for logDir in ('/var/log', os.path.expanduser('~'), tempfile.gettempdir()):
             try:
                 fname1 = os.path.join (logDir, 'opengnsys.log')
-                fmt1 = logging.Formatter (fmt='%(levelname)s %(asctime)s (%(threadName)s) (%(funcName)s) %(message)s')
+                fmt1 = logging.Formatter (fmt='%(levelname)s %(asctime)s in_oglive=%(in_oglive)s (%(threadName)s) (%(funcName)s) %(message)s')
                 fh1 = logging.FileHandler (filename=fname1, mode='a')
                 fh1.setFormatter (fmt1)
                 fh1.setLevel (logging.DEBUG)
 
                 fname2 = os.path.join (logDir, 'opengnsys.json.log')
-                fmt2 = JsonFormatter ({"timestamp": "asctime", "severity": "levelname", "threadName": "threadName", "function": "funcName", "message": "message"}, time_format='%Y-%m-%d %H:%M:%S', msec_format='')
+                fmt2 = JsonFormatter ({"timestamp": "asctime", "severity": "levelname", "in_oglive": "in_oglive", "threadName": "threadName", "function": "funcName", "message": "message"}, time_format='%Y-%m-%d %H:%M:%S', msec_format='')
                 fh2 = logging.FileHandler (filename=fname2, mode='a')
                 fh2.setFormatter (fmt2)
                 fh2.setLevel (logging.DEBUG)
@@ -77,11 +79,14 @@ class LocalLogger(object):
         self.logger = None
 
     def log(self, level, message):
+        if self.extra['in_oglive'] is None:
+            self.extra['in_oglive'] = os.path.exists ('/scripts/functions')
+
         # Debug messages are logged to a file
         # our loglevels are 10000 (other), 20000 (debug), ....
         # logging levels are 10 (debug), 20 (info)
         # OTHER = logging.NOTSET
-        self.logger.log(int(level / 1000) - 10, message, stacklevel=4)
+        self.logger.log(int(level / 1000) - 10, message, stacklevel=4, extra=self.extra)
 
     def isWindows(self):
         return False

src/opengnsys/windows/log.py

@@ -44,17 +44,19 @@ OTHER, DEBUG, INFO, WARN, ERROR, FATAL = (10000 * (x + 1) for x in range(6))
 
 class LocalLogger(object):
     def __init__(self):
+        self.extra = { 'in_oglive': False }
+
         # tempdir is different for "user application" and "service"
         # service wil get c:\windows\temp, while user will get c:\users\XXX\appdata\local\temp
 
         fname1 = os.path.join (tempfile.gettempdir(), 'opengnsys.log')
-        fmt1 = logging.Formatter (fmt='%(levelname)s %(asctime)s (%(threadName)s) (%(funcName)s) %(message)s')
+        fmt1 = logging.Formatter (fmt='%(levelname)s %(asctime)s in_oglive=%(in_oglive)s (%(threadName)s) (%(funcName)s) %(message)s')
         fh1 = logging.FileHandler (filename=fname1, mode='a')
         fh1.setFormatter (fmt1)
         fh1.setLevel (logging.DEBUG)
 
         fname2 = os.path.join (tempfile.gettempdir(), 'opengnsys.json.log')
-        fmt2 = JsonFormatter ({"timestamp": "asctime", "severity": "levelname", "threadName": "threadName", "function": "funcName", "message": "message"}, time_format='%Y-%m-%d %H:%M:%S', msec_format='')
+        fmt2 = JsonFormatter ({"timestamp": "asctime", "severity": "levelname", "in_oglive": "in_oglive", "threadName": "threadName", "function": "funcName", "message": "message"}, time_format='%Y-%m-%d %H:%M:%S', msec_format='')
         fh2 = logging.FileHandler (filename=fname2, mode='a')
         fh2.setFormatter (fmt2)
         fh2.setLevel (logging.DEBUG)
@@ -71,7 +73,7 @@ class LocalLogger(object):
         # our loglevels are 10000 (other), 20000 (debug), ....
         # logging levels are 10 (debug), 20 (info)
         # OTHER = logging.NOTSET
-        self.logger.log(int(level / 1000 - 10), message, stacklevel=4)
+        self.logger.log(int(level / 1000 - 10), message, stacklevel=4, extra=self.extra)
 
         if level < INFO or self.serviceLogger is False:  # Only information and above will be on event log
             return