Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
aa9174ebaf
|
|||
|
67ad6ccb94
|
|||
|
0fe530c6a2
|
|||
|
0071498122
|
|||
|
f7a7533efa
|
|||
|
a0f497ce25
|
|||
|
8cee9eef62
|
@@ -1,3 +1,6 @@
|
|||||||
/.venv/
|
/.venv/
|
||||||
/.idea/
|
/.idea/
|
||||||
/test/log/
|
/test/log/
|
||||||
|
/build/
|
||||||
|
/dist/
|
||||||
|
/eh_logging.egg-info/
|
||||||
|
|||||||
Generated
-10
@@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<module type="PYTHON_MODULE" version="4">
|
|
||||||
<component name="NewModuleRootManager">
|
|
||||||
<content url="file://$MODULE_DIR$">
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/.venv" />
|
|
||||||
</content>
|
|
||||||
<orderEntry type="inheritedJdk" />
|
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
|
||||||
</component>
|
|
||||||
</module>
|
|
||||||
Generated
+1
-1
@@ -3,5 +3,5 @@
|
|||||||
<component name="Black">
|
<component name="Black">
|
||||||
<option name="sdkName" value="Python 3.12 (ehLogger)" />
|
<option name="sdkName" value="Python 3.12 (ehLogger)" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (ehLogger)" project-jdk-type="Python SDK" />
|
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (eh_logging)" project-jdk-type="Python SDK" />
|
||||||
</project>
|
</project>
|
||||||
Generated
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ProjectModuleManager">
|
<component name="ProjectModuleManager">
|
||||||
<modules>
|
<modules>
|
||||||
<module fileurl="file://$PROJECT_DIR$/.idea/eh_logger.iml" filepath="$PROJECT_DIR$/.idea/eh_logger.iml" />
|
<module fileurl="file://$PROJECT_DIR$/.idea/eh_logging.iml" filepath="$PROJECT_DIR$/.idea/eh_logging.iml" />
|
||||||
</modules>
|
</modules>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
<component name="ProjectRunConfigurationManager">
|
||||||
<configuration default="false" name="build" type="PythonConfigurationType" factoryName="Python">
|
<configuration default="false" name="build" type="PythonConfigurationType" factoryName="Python">
|
||||||
<module name="eh_logger" />
|
<module name="eh_logging" />
|
||||||
<option name="ENV_FILES" value="" />
|
<option name="ENV_FILES" value="" />
|
||||||
<option name="INTERPRETER_OPTIONS" value="" />
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
<option name="PARENT_ENVS" value="true" />
|
<option name="PARENT_ENVS" value="true" />
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
<env name="PYTHONUNBUFFERED" value="1" />
|
<env name="PYTHONUNBUFFERED" value="1" />
|
||||||
</envs>
|
</envs>
|
||||||
<option name="SDK_HOME" value="" />
|
<option name="SDK_HOME" value="" />
|
||||||
<option name="SDK_NAME" value="Python 3.12 (ehLogger)" />
|
<option name="SDK_NAME" value="Python 3.12 (eh_logging)" />
|
||||||
<option name="WORKING_DIRECTORY" value="" />
|
<option name="WORKING_DIRECTORY" value="" />
|
||||||
<option name="IS_MODULE_SDK" value="false" />
|
<option name="IS_MODULE_SDK" value="false" />
|
||||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
# ehLogger
|
# eh_logging
|
||||||
|
|
||||||
> Simple helper to get easier formatted logger from the python logging module
|
> Simple helper to get easier formatted logger from the python logging module
|
||||||
|
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
Vendored
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+3
-3
@@ -1,13 +1,13 @@
|
|||||||
|
|
||||||
# eh-logger
|
# eh_logging
|
||||||
|
|
||||||
> Simple helper to get easier formatted logger from the python logging module
|
> Simple helper to get easier formatted logger from the python logging module
|
||||||
|
|
||||||
# install
|
# install
|
||||||
|
|
||||||
pip install git+https://git.eishausener.dev/Eishausener/eh-logger \
|
pip install git+https://git.eishausener.dev/Eishausener/eh_logging \
|
||||||
or \
|
or \
|
||||||
pip install git+https://github.com/Eishausener/eh-logger
|
pip install git+https://github.com/Eishausener/eh_logging
|
||||||
|
|
||||||
# usage
|
# usage
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
# ehLogger
|
# eh_logging
|
||||||
|
|
||||||
> Simple helper to get easier formatted logger from the python logging module
|
> Simple helper to get easier formatted logger from the python logging module
|
||||||
|
|
||||||
|
|||||||
+28
-12
@@ -1,3 +1,11 @@
|
|||||||
|
"""
|
||||||
|
eh_logging
|
||||||
|
^^^^^^^^^^
|
||||||
|
|
||||||
|
Simple helper to get easier formatted logger from the python logging module
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
@@ -25,9 +33,9 @@ __all__ = tuple(logging__all__ + [
|
|||||||
'set_default_logger',
|
'set_default_logger',
|
||||||
'warning',
|
'warning',
|
||||||
])
|
])
|
||||||
__version__ = '0.1.2'
|
__version__ = '0.1.7'
|
||||||
__author__ = 'Eishausener <code@eishausener.de>'
|
__author__ = 'Eishausener <code@eishausener.de>'
|
||||||
__name__ = 'eh-logger'
|
__name__ = 'eh_logging'
|
||||||
|
|
||||||
##########
|
##########
|
||||||
# config #
|
# config #
|
||||||
@@ -41,6 +49,9 @@ _DEBUG = False
|
|||||||
class DEFAULT:
|
class DEFAULT:
|
||||||
# -- Default Logger Name -- #
|
# -- Default Logger Name -- #
|
||||||
LOGGER_NAME = 'eh_logging'
|
LOGGER_NAME = 'eh_logging'
|
||||||
|
# -- Default Handler internal name -- #
|
||||||
|
HANDLER_NAME_STREAM = 'eh_logging-stream-default'
|
||||||
|
HANDLER_NAME_TEMP_STREAM = 'eh_logging-stream-helper'
|
||||||
# -- Logger Space -- #
|
# -- Logger Space -- #
|
||||||
SPACE_LOGGER_NAME = 11
|
SPACE_LOGGER_NAME = 11
|
||||||
SPACE_LEVEL = 8
|
SPACE_LEVEL = 8
|
||||||
@@ -103,10 +114,10 @@ def _init():
|
|||||||
_logger = getLogger(DEFAULT.LOGGER_NAME)
|
_logger = getLogger(DEFAULT.LOGGER_NAME)
|
||||||
_changed = True
|
_changed = True
|
||||||
|
|
||||||
if not _logger.handlers:
|
if not _logger.hasHandlers():
|
||||||
print_debug(f'[DEBUG] adding stream handler to logger. (addr: {id(_logger)})')
|
print_debug(f'[DEBUG] adding stream handler to logger. (addr: {id(_logger)})')
|
||||||
_handler = StreamHandler()
|
_handler = StreamHandler()
|
||||||
_handler.name = 'eh_logging-stream-helper' # should not be displayed. only for internal use
|
_handler.name = DEFAULT.HANDLER_NAME_TEMP_STREAM # should not be displayed. only for internal use
|
||||||
_logger.addHandler(_handler)
|
_logger.addHandler(_handler)
|
||||||
_changed = True
|
_changed = True
|
||||||
|
|
||||||
@@ -603,16 +614,21 @@ def _init_default_logger():
|
|||||||
Initialize the default logger with a formatted logger
|
Initialize the default logger with a formatted logger
|
||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
|
removed = False
|
||||||
_logger = getLogger(DEFAULT.LOGGER_NAME)
|
_logger = getLogger(DEFAULT.LOGGER_NAME)
|
||||||
_formatter = FormatterColor()
|
|
||||||
_handler = StreamHandler()
|
|
||||||
_handler.setFormatter(_formatter)
|
|
||||||
_handler.name = 'eh_logging-stream-default' # should not be displayed. only for internal use
|
|
||||||
# remove all handlers to prevent duplicate handlers
|
|
||||||
for handler in _logger.handlers:
|
for handler in _logger.handlers:
|
||||||
_logger.removeHandler(handler)
|
if handler.name == DEFAULT.HANDLER_NAME_TEMP_STREAM:
|
||||||
_logger.addHandler(_handler)
|
# remove temp handler
|
||||||
_default_logger.set(_logger)
|
_logger.removeHandler(handler)
|
||||||
|
removed = True
|
||||||
|
if removed or not _logger.hasHandlers():
|
||||||
|
# add new formatted stream handler
|
||||||
|
_formatter = FormatterColor()
|
||||||
|
_handler = StreamHandler()
|
||||||
|
_handler.setFormatter(_formatter)
|
||||||
|
_handler.name = DEFAULT.HANDLER_NAME_STREAM # should not be displayed. only for internal use
|
||||||
|
_logger.addHandler(_handler)
|
||||||
|
_default_logger.set(_logger)
|
||||||
|
|
||||||
|
|
||||||
_init_default_logger()
|
_init_default_logger()
|
||||||
|
|||||||
@@ -1,107 +0,0 @@
|
|||||||
Metadata-Version: 2.1
|
|
||||||
Name: eh-logger
|
|
||||||
Version: 0.1.1
|
|
||||||
Summary: Simple helper to get easier formatted logger from the python logging module
|
|
||||||
Home-page: https://git.eishausener.dev/Eishausener/eh-logger
|
|
||||||
Author: Eishausener <code@eishausener.de>
|
|
||||||
Author-email: code@eishausener.de
|
|
||||||
License: MIT
|
|
||||||
Project-URL: issue tracker, https://git.eishausener.dev/Eishausener/eh-logger/issues
|
|
||||||
Classifier: License :: OSI Approved :: MIT License
|
|
||||||
Description-Content-Type: text/markdown
|
|
||||||
Provides-Extra: dev
|
|
||||||
Requires-Dist: twine; extra == "dev"
|
|
||||||
Requires-Dist: wheel; extra == "dev"
|
|
||||||
Requires-Dist: setuptools; extra == "dev"
|
|
||||||
|
|
||||||
|
|
||||||
# eh-logger
|
|
||||||
|
|
||||||
> Simple helper to get easier formatted logger from the python logging module
|
|
||||||
|
|
||||||
# install
|
|
||||||
|
|
||||||
pip install git+https://git.eishausener.dev/Eishausener/eh-logger \
|
|
||||||
or \
|
|
||||||
pip install git+https://github.com/Eishausener/eh-logger
|
|
||||||
|
|
||||||
# usage
|
|
||||||
|
|
||||||
import eh-logging, create a formatted logger and use the logger
|
|
||||||
|
|
||||||
```python
|
|
||||||
# import
|
|
||||||
import eh_logging as logging
|
|
||||||
|
|
||||||
# create formatted logger
|
|
||||||
formatted_logger = logging.get_formatted_logger(
|
|
||||||
'formatted_logger',
|
|
||||||
console=True,
|
|
||||||
console_level=logging.DEBUG,
|
|
||||||
file=True,
|
|
||||||
file_path=r'log\formatted_logger.log',
|
|
||||||
file_level=logging.DEBUG,
|
|
||||||
file_backup_count=5,
|
|
||||||
file_rotate='h',
|
|
||||||
)
|
|
||||||
|
|
||||||
# use the logger
|
|
||||||
formatted_logger.debug('Example formatted DEBUG Message')
|
|
||||||
formatted_logger.info('Example formatted INFO Message')
|
|
||||||
formatted_logger.warning('Example formatted WARNING Message')
|
|
||||||
formatted_logger.error('Example formatted ERROR Message')
|
|
||||||
formatted_logger.critical('Example formatted CRITICAL Message')
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
use the decorator with the INFO level
|
|
||||||
|
|
||||||
```python
|
|
||||||
# import
|
|
||||||
import eh_logging as logging
|
|
||||||
|
|
||||||
# set default logger to DEBUG level to see output
|
|
||||||
logging.set_default_level(logging.DEBUG)
|
|
||||||
|
|
||||||
|
|
||||||
# use logging decorator with default logger
|
|
||||||
@logging.Decorator.info(arg=True, kwarg=True, return_value=True, decimal_places=1)
|
|
||||||
def example_function(first_param, second_param, *args, **kwargs):
|
|
||||||
return first_param, second_param, *args, *kwargs
|
|
||||||
|
|
||||||
|
|
||||||
# execute function
|
|
||||||
example_function('Hello', 'world', 'test', 'example', hello='world', world='test')
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
use the decorator with own logger
|
|
||||||
|
|
||||||
```python
|
|
||||||
# import
|
|
||||||
import eh_logging as logging
|
|
||||||
|
|
||||||
|
|
||||||
# create formatted logger
|
|
||||||
formatted_logger = logging.get_formatted_logger(
|
|
||||||
'example_decorator_logger',
|
|
||||||
console=True,
|
|
||||||
console_level=logging.DEBUG,
|
|
||||||
file=True,
|
|
||||||
file_path=r'log\decorator_logger.log',
|
|
||||||
file_level=logging.DEBUG,
|
|
||||||
file_backup_count=5,
|
|
||||||
file_rotate='h',
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# use logging decorator with custom logger
|
|
||||||
@logging.Decorator.debug(logger=formatted_logger, arg=True, kwarg=True, return_value=True, decimal_places=1)
|
|
||||||
def example_function(first_param, second_param, *args, **kwargs):
|
|
||||||
return first_param, second_param, *args, *kwargs
|
|
||||||
|
|
||||||
|
|
||||||
# execute function
|
|
||||||
example_function('Hello', 'world', 'test', 'example', hello='world', world='test')
|
|
||||||
|
|
||||||
```
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
README.md
|
|
||||||
setup.py
|
|
||||||
eh_logging/eh_logger.egg-info/PKG-INFO
|
|
||||||
eh_logging/eh_logger.egg-info/SOURCES.txt
|
|
||||||
eh_logging/eh_logger.egg-info/dependency_links.txt
|
|
||||||
eh_logging/eh_logger.egg-info/requires.txt
|
|
||||||
eh_logging/eh_logger.egg-info/top_level.txt
|
|
||||||
test/test.py
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
|
|
||||||
[dev]
|
|
||||||
twine
|
|
||||||
wheel
|
|
||||||
setuptools
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
|
|
||||||
@@ -12,11 +12,10 @@ setup(
|
|||||||
name=name,
|
name=name,
|
||||||
version=version,
|
version=version,
|
||||||
description='Simple helper to get easier formatted logger from the python logging module',
|
description='Simple helper to get easier formatted logger from the python logging module',
|
||||||
package_dir={'': 'eh_logging'},
|
# packages=find_packages(),
|
||||||
packages=find_packages(where='eh_logging'),
|
|
||||||
long_description=long_description,
|
long_description=long_description,
|
||||||
long_description_content_type="text/markdown",
|
long_description_content_type="text/markdown",
|
||||||
url='https://git.eishausener.dev/Eishausener/eh-logger',
|
url='https://git.eishausener.dev/Eishausener/eh_logging',
|
||||||
author=author,
|
author=author,
|
||||||
author_email='code@eishausener.de',
|
author_email='code@eishausener.de',
|
||||||
license='MIT',
|
license='MIT',
|
||||||
@@ -25,9 +24,9 @@ setup(
|
|||||||
'License :: OSI Approved :: MIT License',
|
'License :: OSI Approved :: MIT License',
|
||||||
],
|
],
|
||||||
project_urls={
|
project_urls={
|
||||||
'issue tracker': 'https://git.eishausener.dev/Eishausener/eh-logger/issues',
|
'issue tracker': 'https://git.eishausener.dev/Eishausener/eh_logging/issues',
|
||||||
},
|
},
|
||||||
install_requires=[],
|
# install_requires=[],
|
||||||
extras_require={
|
extras_require={
|
||||||
'dev': ['twine', 'wheel', 'setuptools'],
|
'dev': ['twine', 'wheel', 'setuptools'],
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user