Compare commits
No commits in common. "f0eb5480b5a973a458cdfd3e7e91ef695de064d4" and "91d70dd3322806d983b78ffeec8a6621504268fd" have entirely different histories.
f0eb5480b5
...
91d70dd332
@ -6,12 +6,12 @@ A python lib came from [Difficult Rocket](https://github.com/shenjackyuanjie/Dif
|
|||||||
|
|
||||||
## Information/信息
|
## Information/信息
|
||||||
|
|
||||||
- Version / 版本: 0.3.6
|
- Version / 版本: 0.3.5
|
||||||
- Author / 作者: shenjackyuanjie <3695888@qq.com>
|
- Author / 作者: shenjackyuanjie <3695888@qq.com>
|
||||||
|
|
||||||
[shenjackyuanjie](https://github.com/shenjackyuanjie)
|
[shenjackyuanjie](https://github.com/shenjackyuanjie)
|
||||||
|
|
||||||
> [更新日志|Change Log](docs/change_logs)
|
> [更新日志|Change Log](docs/change_log.md)
|
||||||
|
|
||||||
### License/许可证
|
### License/许可证
|
||||||
|
|
||||||
|
@ -1,9 +1,5 @@
|
|||||||
# lndl 0.3
|
# lndl 0.3
|
||||||
|
|
||||||
## 0.3.6
|
|
||||||
|
|
||||||
- logger 的 `info` 更白了
|
|
||||||
|
|
||||||
## 0.3.5
|
## 0.3.5
|
||||||
|
|
||||||
- 向后移植了一些 `0.4` 的 logger 改动
|
- 向后移植了一些 `0.4` 的 logger 改动
|
||||||
|
@ -8,10 +8,6 @@
|
|||||||
- 现在如果输入的文件名包含 `{time}`
|
- 现在如果输入的文件名包含 `{time}`
|
||||||
- 会自动替换为 `time.strftime("%Y-%m-%d_%H-%M-%S")`
|
- 会自动替换为 `time.strftime("%Y-%m-%d_%H-%M-%S")`
|
||||||
- 修复了一些之前没有发现的问题
|
- 修复了一些之前没有发现的问题
|
||||||
- `config`
|
|
||||||
- 添加了 `get_logger_from_old`
|
|
||||||
- 用于从现有 logger 中获取一个新的 logger
|
|
||||||
- 现在 `info` 级别的默认颜色更白了 (255, 255, 255)
|
|
||||||
|
|
||||||
## Nuitka Compiler Helper
|
## Nuitka Compiler Helper
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# lndl 更新日志
|
# lndl 更新日志
|
||||||
|
|
||||||
## [0.4](/docs/change_logs/0-4.md)
|
## [0.4.0](/docs/change_logs/0-4.md)
|
||||||
|
|
||||||
## [0.3](/docs/change_logs/0-3.md)
|
## [0.3.0](/docs/change_logs/0-3.md)
|
||||||
|
|
||||||
## [old](/docs/change_logs/old.md)
|
## [old](/docs/change_logs/old.md)
|
||||||
|
@ -9,7 +9,7 @@ from typing import TYPE_CHECKING
|
|||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from lib_not_dr import loggers, nuitka, types, command
|
from lib_not_dr import loggers, nuitka, types, command
|
||||||
|
|
||||||
_version_ = "0.3.6"
|
_version_ = "0.3.5"
|
||||||
|
|
||||||
# fmt: off
|
# fmt: off
|
||||||
__all__ = [
|
__all__ = [
|
||||||
|
@ -99,13 +99,13 @@ class LogLevel(Options):
|
|||||||
|
|
||||||
# fmt: off
|
# fmt: off
|
||||||
from lib_not_dr.loggers.config import get_logger, get_config, read_config # noqa: E402
|
from lib_not_dr.loggers.config import get_logger, get_config, read_config # noqa: E402
|
||||||
from lib_not_dr.loggers import config # noqa: E402
|
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from lib_not_dr.loggers import logger
|
from lib_not_dr.loggers import logger
|
||||||
from lib_not_dr.loggers import formatter
|
from lib_not_dr.loggers import formatter
|
||||||
from lib_not_dr.loggers import outstream
|
from lib_not_dr.loggers import outstream
|
||||||
from lib_not_dr.loggers import structure
|
from lib_not_dr.loggers import structure
|
||||||
|
from lib_not_dr.loggers import config
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
# modules
|
# modules
|
||||||
|
@ -324,13 +324,11 @@ _storage = ConfigStorage(loggers={'root': Logger(logger_name='root')})
|
|||||||
|
|
||||||
|
|
||||||
def get_config() -> ConfigStorage:
|
def get_config() -> ConfigStorage:
|
||||||
global _storage
|
|
||||||
return _storage
|
return _storage
|
||||||
|
|
||||||
|
|
||||||
def get_logger(name: str = 'root', storage: Optional[ConfigStorage] = None) -> Logger:
|
def get_logger(name: str = 'root', storage: Optional[ConfigStorage] = None) -> Logger:
|
||||||
if storage is None:
|
if storage is None:
|
||||||
global _storage
|
|
||||||
storage = _storage
|
storage = _storage
|
||||||
|
|
||||||
if name not in storage.loggers:
|
if name not in storage.loggers:
|
||||||
@ -340,42 +338,9 @@ def get_logger(name: str = 'root', storage: Optional[ConfigStorage] = None) -> L
|
|||||||
return storage.loggers[name]
|
return storage.loggers[name]
|
||||||
|
|
||||||
|
|
||||||
def get_logger_from_old(name: str, old_name: str = 'root', storage: Optional[ConfigStorage] = None) -> Logger:
|
|
||||||
if storage is None:
|
|
||||||
global _storage
|
|
||||||
storage = _storage
|
|
||||||
|
|
||||||
if name not in storage.loggers:
|
|
||||||
root_log = get_logger(old_name, storage).clone_logger()
|
|
||||||
root_log.logger_name = name
|
|
||||||
storage.loggers[name] = root_log
|
|
||||||
return storage.loggers[name]
|
|
||||||
|
|
||||||
|
|
||||||
def add_logger(name: str, logger: Logger, storage: Optional[ConfigStorage] = None) -> None:
|
|
||||||
if storage is None:
|
|
||||||
global _storage
|
|
||||||
storage = _storage
|
|
||||||
|
|
||||||
storage.loggers[name] = logger
|
|
||||||
|
|
||||||
|
|
||||||
def read_config(log_config: Dict, storage: Optional[ConfigStorage] = None) -> ConfigStorage:
|
def read_config(log_config: Dict, storage: Optional[ConfigStorage] = None) -> ConfigStorage:
|
||||||
if storage is None:
|
if storage is None:
|
||||||
global _storage
|
|
||||||
storage = _storage
|
storage = _storage
|
||||||
|
|
||||||
storage.read_dict_config(log_config)
|
storage.read_dict_config(log_config)
|
||||||
return storage
|
return storage
|
||||||
|
|
||||||
|
|
||||||
# fmt: off
|
|
||||||
__all__ = [
|
|
||||||
"get_config",
|
|
||||||
"get_logger",
|
|
||||||
"_storage",
|
|
||||||
"read_config",
|
|
||||||
"ConfigStorage",
|
|
||||||
]
|
|
||||||
# 整的跟 export 一样
|
|
||||||
# fmt: on
|
|
||||||
|
@ -34,7 +34,7 @@ class BaseColorFormatter(BaseFormatter):
|
|||||||
# Debug: cyan
|
# Debug: cyan
|
||||||
LogLevel.debug: "\033[0;36m",
|
LogLevel.debug: "\033[0;36m",
|
||||||
# Info: white
|
# Info: white
|
||||||
LogLevel.info: "\033[0;38;2;255;255;255m",
|
LogLevel.info: "\033[0;37m",
|
||||||
# Warn: yellow
|
# Warn: yellow
|
||||||
LogLevel.warn: "\033[0;33m",
|
LogLevel.warn: "\033[0;33m",
|
||||||
# Error: red
|
# Error: red
|
||||||
@ -67,7 +67,7 @@ class LevelColorFormatter(BaseColorFormatter):
|
|||||||
# Debug: cyan
|
# Debug: cyan
|
||||||
LogLevel.debug: "\033[38;2;133;138;149m",
|
LogLevel.debug: "\033[38;2;133;138;149m",
|
||||||
# Info: white
|
# Info: white
|
||||||
LogLevel.info: "\033[0;38;2;255;255;255m",
|
LogLevel.info: "\033[0;37m",
|
||||||
# Warn: yellow
|
# Warn: yellow
|
||||||
LogLevel.warn: "\033[0;33m",
|
LogLevel.warn: "\033[0;33m",
|
||||||
# Error: red
|
# Error: red
|
||||||
@ -106,7 +106,7 @@ class LoggerColorFormatter(BaseColorFormatter):
|
|||||||
# Debug: cyan
|
# Debug: cyan
|
||||||
LogLevel.debug: "\033[0;36m",
|
LogLevel.debug: "\033[0;36m",
|
||||||
# Info: white
|
# Info: white
|
||||||
LogLevel.info: "\033[0;38;2;255;255;255m",
|
LogLevel.info: "\033[0;37m",
|
||||||
# Warn: yellow
|
# Warn: yellow
|
||||||
LogLevel.warn: "\033[0;33m",
|
LogLevel.warn: "\033[0;33m",
|
||||||
# Error: red
|
# Error: red
|
||||||
@ -153,7 +153,7 @@ class TimeColorFormatter(BaseColorFormatter):
|
|||||||
# Debug: cyan
|
# Debug: cyan
|
||||||
LogLevel.debug: "\033[0;36m",
|
LogLevel.debug: "\033[0;36m",
|
||||||
# Info: white
|
# Info: white
|
||||||
LogLevel.info: "\033[0;38;2;255;255;255m",
|
LogLevel.info: "\033[0;37m",
|
||||||
# Warn: yellow
|
# Warn: yellow
|
||||||
LogLevel.warn: "\033[0;33m",
|
LogLevel.warn: "\033[0;33m",
|
||||||
# Error: red
|
# Error: red
|
||||||
@ -194,7 +194,7 @@ class TraceColorFormatter(BaseColorFormatter):
|
|||||||
# Debug: cyan
|
# Debug: cyan
|
||||||
LogLevel.debug: "\033[38;2;0;255;180m",
|
LogLevel.debug: "\033[38;2;0;255;180m",
|
||||||
# Info: white
|
# Info: white
|
||||||
LogLevel.info: "\033[0;38;2;255;255;255m",
|
LogLevel.info: "\033[38;2;0;255;180m",
|
||||||
# Warn: yellow
|
# Warn: yellow
|
||||||
LogLevel.warn: "\033[38;2;0;255;180m",
|
LogLevel.warn: "\033[38;2;0;255;180m",
|
||||||
# Error: red
|
# Error: red
|
||||||
@ -247,7 +247,7 @@ class MessageColorFormatter(BaseColorFormatter):
|
|||||||
# Debug: blue
|
# Debug: blue
|
||||||
LogLevel.debug: "\033[38;2;138;173;244m",
|
LogLevel.debug: "\033[38;2;138;173;244m",
|
||||||
# Info: no color
|
# Info: no color
|
||||||
LogLevel.info: "\033[0;38;2;255;255;255m",
|
LogLevel.info: "",
|
||||||
# Warn: yellow
|
# Warn: yellow
|
||||||
LogLevel.warn: "\033[0;33m",
|
LogLevel.warn: "\033[0;33m",
|
||||||
# Error: red
|
# Error: red
|
||||||
|
Loading…
Reference in New Issue
Block a user