climate-ref-celery 0.5.5__tar.gz → 0.6.1__tar.gz

{climate_ref_celery-0.5.5 → climate_ref_celery-0.6.1}/PKG-INFO

@@ -1,8 +1,9 @@
 Metadata-Version: 2.4
 Name: climate-ref-celery
-Version: 0.5.5
+Version: 0.6.1
 Summary: Celery app for mananging tasks and workers
 Author-email: Jared Lewis <jared.lewis@climate-resource.com>
+License-Expression: Apache-2.0
 License-File: LICENCE
 License-File: NOTICE
 Classifier: Development Status :: 3 - Alpha

{climate_ref_celery-0.5.5 → climate_ref_celery-0.6.1}/pyproject.toml

@@ -1,11 +1,12 @@
 [project]
 name = "climate-ref-celery"
-version = "0.5.5"
+version = "0.6.1"
 description = "Celery app for mananging tasks and workers"
 readme = "README.md"
 authors = [
     { name = "Jared Lewis", email = "jared.lewis@climate-resource.com" }
 ]
+license = "Apache-2.0"
 requires-python = ">=3.11"
 classifiers = [
     "Development Status :: 3 - Alpha",

{climate_ref_celery-0.5.5 → climate_ref_celery-0.6.1}/src/climate_ref_celery/app.py

@@ -11,7 +11,7 @@ from loguru import logger
 from rich.pretty import pretty_repr
 
 from climate_ref.config import Config
-from climate_ref_core.logging import add_log_handler, capture_logging
+from climate_ref_core.logging import initialise_logging
 
 os.environ.setdefault("CELERY_CONFIG_MODULE", "climate_ref_celery.celeryconf.dev")
 
@@ -33,16 +33,11 @@ def create_celery_app(name: str) -> Celery:
 @setup_logging.connect
 def setup_logging_handler(loglevel: int, **kwargs: Any) -> None:  # pragma: no cover
     """Set up logging for the Celery worker using the celery signal"""
-    capture_logging()
-
-    # Include process name in celery logs
-    msg_format = (
-        "<green>{time:YYYY-MM-DD HH:mm:ss.SSS Z}</green> | <level>{level: <8}</level> | {process.name} | "
-        "<cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>"
-    )
+    # We ignore the format passed by Celery instead using our own configuration
+    config = Config.default()
+    msg_format = config.log_format
 
-    logger.remove()
-    add_log_handler(level=loglevel, format=msg_format, colorize=True)
+    initialise_logging(level=loglevel, format=msg_format, log_directory=config.paths.log)
 
 
 @worker_ready.connect