|
2 | 2 | """
|
3 | 3 |
|
4 | 4 | import argparse
|
5 |
| -import logging |
| 5 | +import logging.config |
6 | 6 | import os
|
7 | 7 | import sys
|
8 | 8 | from typing import Any, Mapping, Optional
|
|
36 | 36 |
|
37 | 37 | logger = logging.getLogger(__name__)
|
38 | 38 |
|
39 |
| - |
40 |
| -def setup_logging(loglevel): # pragma: no cover |
| 39 | +DEFAULT_LOGGING_CONFIG = { |
| 40 | + "version": 1, |
| 41 | + "disable_existing_loggers": False, |
| 42 | + "formatters": { |
| 43 | + "full": { |
| 44 | + "format": "[%(asctime)s] %(levelname)s:%(name)s:%(message)s", |
| 45 | + } |
| 46 | + }, |
| 47 | + "handlers": { |
| 48 | + "stderr": { |
| 49 | + "class": "logging.StreamHandler", |
| 50 | + "stream": "ext://sys.stderr", |
| 51 | + "level": "DEBUG", |
| 52 | + "formatter": "full", |
| 53 | + } |
| 54 | + }, |
| 55 | + "loggers": {"kisee": {"level": "DEBUG", "handlers": ["stderr"]}}, |
| 56 | +} |
| 57 | + |
| 58 | + |
| 59 | +def setup_logging(settings: dict): # pragma: no cover |
41 | 60 | """Setup basic logging
|
42 | 61 | Args:
|
43 | 62 | loglevel (int): minimum loglevel for emitting messages
|
44 | 63 | """
|
45 |
| - logformat = "[%(asctime)s] %(levelname)s:%(name)s:%(message)s" |
46 |
| - logging.basicConfig( |
47 |
| - level=50 - (loglevel * 10), |
48 |
| - stream=sys.stdout, |
49 |
| - format=logformat, |
50 |
| - datefmt="%Y-%m-%d %H:%M:%S", |
51 |
| - ) |
| 64 | + conf = settings["logging"] if "logging" in settings else DEFAULT_LOGGING_CONFIG |
| 65 | + logging.config.dictConfig(conf) |
52 | 66 | logger.info("Kisee %s starting!", kisee.__version__)
|
53 | 67 |
|
54 | 68 |
|
@@ -77,14 +91,6 @@ def parse_args(program_args=None) -> argparse.Namespace:
|
77 | 91 | program_args = sys.argv[1:]
|
78 | 92 | parser = argparse.ArgumentParser(description="Shape Identity Provider")
|
79 | 93 | parser.add_argument("--settings", default="settings.toml")
|
80 |
| - parser.add_argument( |
81 |
| - "-v", |
82 |
| - "--verbose", |
83 |
| - dest="loglevel", |
84 |
| - default=0, |
85 |
| - help="Verbose mode (-vv for more, -vvv, …)", |
86 |
| - action="count", |
87 |
| - ) |
88 | 94 | return parser.parse_args(program_args)
|
89 | 95 |
|
90 | 96 |
|
@@ -146,8 +152,8 @@ async def on_cleanup_wrapper(app):
|
146 | 152 | def main() -> None: # pragma: no cover
|
147 | 153 | """Command line entry point."""
|
148 | 154 | args = parse_args()
|
149 |
| - setup_logging(args.loglevel) |
150 | 155 | settings = load_conf(args.settings)
|
| 156 | + setup_logging(settings) |
151 | 157 | if sentry_sdk:
|
152 | 158 | sentry_sdk.init( # pylint: disable=abstract-class-instantiated
|
153 | 159 | # see https://github.com/getsentry/sentry-python/issues/1081
|
|
0 commit comments