refs #2537 log whether we are in ogLive or not
parent
4a8fc2b469
commit
198353b214
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1 +1 @@
|
|||
7.1.0
|
||||
7.2.0
|
||||
|
|
|
@ -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
|
||||
|
@ -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
|
||||
|
|
|
@ -44,6 +44,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': 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
|
||||
|
||||
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue