From 4db000f6d78493aa035a4a6174a9f05be3bf0a47 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sun, 2 Oct 2022 23:15:07 +0200 Subject: [PATCH] Added protected log and path getter to logger in cpl-core --- src/cpl_core/__init__.py | 4 ++-- src/cpl_core/application/__init__.py | 4 ++-- src/cpl_core/configuration/__init__.py | 4 ++-- src/cpl_core/console/__init__.py | 4 ++-- src/cpl_core/cpl-core.json | 2 +- src/cpl_core/database/__init__.py | 4 ++-- src/cpl_core/database/connection/__init__.py | 4 ++-- src/cpl_core/database/context/__init__.py | 4 ++-- src/cpl_core/dependency_injection/__init__.py | 4 ++-- src/cpl_core/environment/__init__.py | 4 ++-- src/cpl_core/logging/__init__.py | 4 ++-- src/cpl_core/logging/logger_service.py | 23 +++++++++++++++---- src/cpl_core/mailing/__init__.py | 4 ++-- src/cpl_core/pipes/__init__.py | 4 ++-- src/cpl_core/time/__init__.py | 4 ++-- src/cpl_core/utils/__init__.py | 4 ++-- 16 files changed, 47 insertions(+), 34 deletions(-) diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py index 3b953e35..89061425 100644 --- a/src/cpl_core/__init__.py +++ b/src/cpl_core/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_core' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de' -__version__ = '2022.10.0.post2' +__version__ = '2022.10.0.post3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3') diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py index 91a45a13..2c3a0a58 100644 --- a/src/cpl_core/application/__init__.py +++ b/src/cpl_core/application/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_core.application' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de' -__version__ = '2022.10.0.post2' +__version__ = '2022.10.0.post3' from collections import namedtuple @@ -29,4 +29,4 @@ from .startup_abc import StartupABC from .startup_extension_abc import StartupExtensionABC VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3') diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py index 36328afd..9d5ccc69 100644 --- a/src/cpl_core/configuration/__init__.py +++ b/src/cpl_core/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_core.configuration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de' -__version__ = '2022.10.0.post2' +__version__ = '2022.10.0.post3' from collections import namedtuple @@ -35,4 +35,4 @@ from .validator_abc import ValidatorABC from .variable_argument import VariableArgument VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3') diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py index 53698ed7..218fa206 100644 --- a/src/cpl_core/console/__init__.py +++ b/src/cpl_core/console/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_core.console' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de' -__version__ = '2022.10.0.post2' +__version__ = '2022.10.0.post3' from collections import namedtuple @@ -28,4 +28,4 @@ from .foreground_color_enum import ForegroundColorEnum from .spinner_thread import SpinnerThread VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3') diff --git a/src/cpl_core/cpl-core.json b/src/cpl_core/cpl-core.json index 4f281423..6bca94bc 100644 --- a/src/cpl_core/cpl-core.json +++ b/src/cpl_core/cpl-core.json @@ -4,7 +4,7 @@ "Version": { "Major": "2022", "Minor": "10", - "Micro": "0.post2" + "Micro": "0.post3" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py index 8a967d9c..cbe61037 100644 --- a/src/cpl_core/database/__init__.py +++ b/src/cpl_core/database/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_core.database' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de' -__version__ = '2022.10.0.post2' +__version__ = '2022.10.0.post3' from collections import namedtuple @@ -26,4 +26,4 @@ from .database_settings import DatabaseSettings from .table_abc import TableABC VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3') diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py index 996212a0..e9cfb6d5 100644 --- a/src/cpl_core/database/connection/__init__.py +++ b/src/cpl_core/database/connection/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.connection' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de' -__version__ = '2022.10.0.post2' +__version__ = '2022.10.0.post3' from collections import namedtuple @@ -25,4 +25,4 @@ from .database_connection import DatabaseConnection from .database_connection_abc import DatabaseConnectionABC VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3') diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py index 99f88bbc..95882894 100644 --- a/src/cpl_core/database/context/__init__.py +++ b/src/cpl_core/database/context/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.context' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de' -__version__ = '2022.10.0.post2' +__version__ = '2022.10.0.post3' from collections import namedtuple @@ -25,4 +25,4 @@ from .database_context import DatabaseContext from .database_context_abc import DatabaseContextABC VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3') diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py index d3f67fb8..f2f16e44 100644 --- a/src/cpl_core/dependency_injection/__init__.py +++ b/src/cpl_core/dependency_injection/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_core.dependency_injection' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de' -__version__ = '2022.10.0.post2' +__version__ = '2022.10.0.post3' from collections import namedtuple @@ -31,4 +31,4 @@ from .service_provider import ServiceProvider from .service_provider_abc import ServiceProviderABC VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3') diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py index 18f1cafb..e55bb515 100644 --- a/src/cpl_core/environment/__init__.py +++ b/src/cpl_core/environment/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_core.environment' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de' -__version__ = '2022.10.0.post2' +__version__ = '2022.10.0.post3' from collections import namedtuple @@ -26,4 +26,4 @@ from .environment_name_enum import EnvironmentNameEnum from .application_environment import ApplicationEnvironment VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3') diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py index a6fb4c93..de8c3762 100644 --- a/src/cpl_core/logging/__init__.py +++ b/src/cpl_core/logging/__init__.py @@ -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.post2' +__version__ = '2022.10.0.post3' 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.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3') diff --git a/src/cpl_core/logging/logger_service.py b/src/cpl_core/logging/logger_service.py index 55261e76..d2b14fe9 100644 --- a/src/cpl_core/logging/logger_service.py +++ b/src/cpl_core/logging/logger_service.py @@ -37,16 +37,29 @@ class Logger(LoggerABC): self._check_for_settings(self._time_format_settings, TimeFormatSettings) self._check_for_settings(self._log_settings, LoggingSettings) - self._log = Template(self._log_settings.filename).substitute( - date_time_now=self._env.date_time_now.strftime(self._time_format_settings.date_time_format), - start_time=self._env.start_time.strftime(self._time_format_settings.date_time_log_format) - ) - self._path = self._log_settings.path self._level = self._log_settings.level self._console = self._log_settings.console self.create() + @property + def _log(self) -> str: + return Template(self._log_settings.filename).substitute( + date_time_now=self._env.date_time_now.strftime(self._time_format_settings.date_time_format), + date_now=self._env.date_time_now.strftime(self._time_format_settings.date_format), + time_now=self._env.date_time_now.strftime(self._time_format_settings.time_format), + start_time=self._env.start_time.strftime(self._time_format_settings.date_time_log_format) + ) + + @property + def _path(self) -> str: + return Template(self._log_settings.path).substitute( + date_time_now=self._env.date_time_now.strftime(self._time_format_settings.date_time_format), + date_now=self._env.date_time_now.strftime(self._time_format_settings.date_format), + time_now=self._env.date_time_now.strftime(self._time_format_settings.time_format), + start_time=self._env.start_time.strftime(self._time_format_settings.date_time_log_format) + ) + def _check_for_settings(self, settings: ConfigurationModelABC, settings_type: type): self._level = LoggingLevelEnum.OFF self._console = LoggingLevelEnum.FATAL diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py index 1c1cc2db..17e76581 100644 --- a/src/cpl_core/mailing/__init__.py +++ b/src/cpl_core/mailing/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_core.mailing' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de' -__version__ = '2022.10.0.post2' +__version__ = '2022.10.0.post3' from collections import namedtuple @@ -28,4 +28,4 @@ from .email_client_settings import EMailClientSettings from .email_client_settings_name_enum import EMailClientSettingsNameEnum VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3') diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py index eb732cef..f6ac0cc1 100644 --- a/src/cpl_core/pipes/__init__.py +++ b/src/cpl_core/pipes/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_core.pipes' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de' -__version__ = '2022.10.0.post2' +__version__ = '2022.10.0.post3' from collections import namedtuple @@ -30,4 +30,4 @@ from .to_camel_case_pipe import ToCamelCasePipe from .to_snake_case_pipe import ToSnakeCasePipe VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3') diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py index b53f30d2..409319bb 100644 --- a/src/cpl_core/time/__init__.py +++ b/src/cpl_core/time/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_core.time' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de' -__version__ = '2022.10.0.post2' +__version__ = '2022.10.0.post3' from collections import namedtuple @@ -25,4 +25,4 @@ from .time_format_settings import TimeFormatSettings from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3') diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py index 942dc93c..fcd88e05 100644 --- a/src/cpl_core/utils/__init__.py +++ b/src/cpl_core/utils/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_core.utils' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de' -__version__ = '2022.10.0.post2' +__version__ = '2022.10.0.post3' from collections import namedtuple @@ -26,4 +26,4 @@ from .string import String from .pip import Pip VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0.post2') +version_info = VersionInfo(major='2022', minor='10', micro='0.post3')