sh-edraft.de/sh_cpl
2
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

Fixed _append_log & create logic in logger_service

Browse Source
This commit is contained in:
Sven Heidemann
2022-10-06 16:24:01 +02:00
parent a22b6fdbdb
commit cc3b1afaa1
16 changed files with 56 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpl_core/logging/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.logging'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
__version__ = '2022.10.0.post3'
__version__ = '2022.10.0.post4'
from collections import namedtuple
@@ -28,4 +28,4 @@ from .logging_settings import LoggingSettings
from .logging_settings_name_enum import LoggingSettingsNameEnum
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2022', minor='10', micro='0.post3')
version_info = VersionInfo(major='2022', minor='10', micro='0.post4')

35
src/cpl_core/logging/logger_service.py
View File

@@ -125,7 +125,8 @@ class Logger(LoggerABC):
try:
# open log file and append always
if not os.path.isdir(self._path):
self._fatal_console(__name__, 'Log directory not found')
self._warn_console(__name__, 'Log directory not found, try to recreate logger')
self.create()
with open(self._path + self._log, "a+", encoding="utf-8") as f:
f.write(string + '\n')
@@ -166,7 +167,7 @@ class Logger(LoggerABC):
if self._level.value >= LoggingLevelEnum.TRACE.value:
self._append_log(output)
# check if message can be shown in console_old
# check if message can be shown in console
if self._console.value >= LoggingLevelEnum.TRACE.value:
Console.set_foreground_color(ForegroundColorEnum.green)
Console.write_line(output)
@@ -179,7 +180,7 @@ class Logger(LoggerABC):
if self._level.value >= LoggingLevelEnum.DEBUG.value:
self._append_log(output)
# check if message can be shown in console_old
# check if message can be shown in console
if self._console.value >= LoggingLevelEnum.DEBUG.value:
Console.set_foreground_color(ForegroundColorEnum.green)
Console.write_line(output)
@@ -192,7 +193,7 @@ class Logger(LoggerABC):
if self._level.value >= LoggingLevelEnum.INFO.value:
self._append_log(output)
# check if message can be shown in console_old
# check if message can be shown in console
if self._console.value >= LoggingLevelEnum.INFO.value:
Console.set_foreground_color(ForegroundColorEnum.green)
Console.write_line(output)
@@ -205,7 +206,7 @@ class Logger(LoggerABC):
if self._level.value >= LoggingLevelEnum.WARN.value:
self._append_log(output)
# check if message can be shown in console_old
# check if message can be shown in console
if self._console.value >= LoggingLevelEnum.WARN.value:
Console.set_foreground_color(ForegroundColorEnum.yellow)
Console.write_line(output)
@@ -224,7 +225,7 @@ class Logger(LoggerABC):
if self._level.value >= LoggingLevelEnum.ERROR.value:
self._append_log(output)
# check if message can be shown in console_old
# check if message can be shown in console
if self._console.value >= LoggingLevelEnum.ERROR.value:
Console.set_foreground_color(ForegroundColorEnum.red)
Console.write_line(output)
@@ -243,7 +244,7 @@ class Logger(LoggerABC):
if self._level.value >= LoggingLevelEnum.FATAL.value:
self._append_log(output)
# check if message can be shown in console_old
# check if message can be shown in console
if self._console.value >= LoggingLevelEnum.FATAL.value:
Console.set_foreground_color(ForegroundColorEnum.red)
Console.write_line(output)
@@ -251,6 +252,24 @@ class Logger(LoggerABC):
sys.exit()
def _warn_console(self, name: str, message: str):
r"""Writes a warning to console only
Parameter
---------
name: :class:`str`
Error name
message: :class:`str`
Error message
"""
# check if message can be shown in console
if self._console.value >= LoggingLevelEnum.FATAL.value:
Console.set_foreground_color(ForegroundColorEnum.red)
Console.write_line(self._get_string(name, LoggingLevelEnum.ERROR, message))
Console.set_foreground_color(ForegroundColorEnum.default)
sys.exit()
def _fatal_console(self, name: str, message: str, ex: Exception = None):
r"""Writes an error to console only
@@ -271,7 +290,7 @@ class Logger(LoggerABC):
else:
output = self._get_string(name, LoggingLevelEnum.ERROR, message)
# check if message can be shown in console_old
# check if message can be shown in console
if self._console.value >= LoggingLevelEnum.FATAL.value:
Console.set_foreground_color(ForegroundColorEnum.red)
Console.write_line(output)