Skip to content

Commit

Permalink
Merge pull request #7648 from drew2a/feature/colorlog
Browse files Browse the repository at this point in the history
Add colorlog
  • Loading branch information
drew2a committed Oct 25, 2023
2 parents 0491745 + 5acf036 commit 633f8bd
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
1 change: 1 addition & 0 deletions requirements-core.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ libtorrent==1.2.19
file-read-backwards==3.0.0
Brotli==1.0.9 # to prevent AttributeError on macOs: module 'brotli' has no attribute 'error' (in urllib3.response)
human-readable==1.3.2
colorlog==6.7.0
4 changes: 3 additions & 1 deletion src/tribler/core/logger/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
import yaml

LOG_CONFIG_FILENAME = 'logger.yaml'

GREEN = "\033[32m"
CYAN = "\033[36m"
logger = logging.getLogger(__name__)


Expand Down Expand Up @@ -52,6 +53,7 @@ def setup_logging(app_mode, log_dir: Path, config_path: Path):
def record_factory(*args, **kwargs):
record = log_factory(*args, **kwargs)
record.app_mode = app_mode
record.app_mode_color = GREEN if app_mode == 'tribler-gui' else CYAN
return record

logger.info(f'Load logger config: app_mode={app_mode}, config_path={config_path}, dir={log_dir}')
Expand Down
14 changes: 12 additions & 2 deletions src/tribler/core/logger/logger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,18 @@ filters:
stdout_filter:
(): tribler.core.logger.logger.StdoutFilter

# Logging formatter
# Logging formatters
formatters:
colored:
(): colorlog.ColoredFormatter
format: "%(app_mode_color)s[%(app_mode)s PID:%(process)d]%(reset)s %(log_color)s%(asctime)s - %(levelname)s - %(name)s(%(lineno)d) - %(message)s"
log_colors:
DEBUG: cyan
WARNING: yellow
ERROR: red
CRITICAL: red,bg_white
GUI: green
CORE: yellow
standard:
format: "[%(app_mode)s PID:%(process)d] %(asctime)s - %(levelname)s - %(name)s(%(lineno)d) - %(message)s"
error:
Expand Down Expand Up @@ -46,7 +56,7 @@ handlers:
stdout_handler:
class: logging.StreamHandler
level: INFO
formatter: standard
formatter: colored
filters: [ stdout_filter ]
stream: ext://tribler.core.logger.logger_streams.stdout_wrapper
Expand Down

0 comments on commit 633f8bd

Please sign in to comment.