diff --git a/cads_broker/config.py b/cads_broker/config.py index 45ab72c7..8ea783a1 100644 --- a/cads_broker/config.py +++ b/cads_broker/config.py @@ -13,12 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging import os -import sys +import cads_common.logging import pydantic -import structlog from cads_broker import expressions @@ -100,24 +98,5 @@ def configure_logger() -> None: This function configures the logging module to log in rfc5424 format. """ - logging.basicConfig( - level=logging.INFO, - format="%(message)s", - stream=sys.stdout, - ) - - structlog.configure( - processors=[ - structlog.contextvars.merge_contextvars, - structlog.stdlib.filter_by_level, - structlog.stdlib.add_logger_name, - structlog.stdlib.add_log_level, - structlog.processors.TimeStamper(fmt="%Y-%m-%d %H:%M.%S"), - structlog.processors.StackInfoRenderer(), - structlog.processors.format_exc_info, - structlog.processors.JSONRenderer(), - ], - wrapper_class=structlog.stdlib.BoundLogger, - logger_factory=structlog.stdlib.LoggerFactory(), - cache_logger_on_first_use=True, - ) + cads_common.logging.structlog_configure() + cads_common.logging.logging_configure() diff --git a/pyproject.toml b/pyproject.toml index fdbb4c25..f8ff1469 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,6 +15,7 @@ classifiers = [ dependencies = [ "attrs", "cacholote", + "cads-common", "distributed", "minio", "sqlalchemy",