climate-ref-celery 0.5.5__py3-none-any.whl → 0.6.1__py3-none-any.whl

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

{climate_ref_celery-0.5.5.dist-info → climate_ref_celery-0.6.1.dist-info}/METADATA

@@ -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.dist-info → climate_ref_celery-0.6.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 climate_ref_celery/__init__.py,sha256=f-dS4JxMLmTCobZtftGDi6bUbtYCv_9iWqxSpC74tWw,129
-climate_ref_celery/app.py,sha256=wLzAnrpzkwZLYY6HY_riHUEtjiRQpkKDSeKZpyMTxAQ,1694
+climate_ref_celery/app.py,sha256=KtDX8-6cye9RzJL5rXbJH1Us_pGYONawYAkOnxTcBmI,1527
 climate_ref_celery/cli.py,sha256=ZQ86XdrBZoBVmgV7WCFp_P6LNCT1hFfM0zXahkK0p-E,3196
 climate_ref_celery/executor.py,sha256=Qsx1bvM_-H3eMeg5VsJAV6ghHuGK3WnYyIRAd0-1DG4,4764
 climate_ref_celery/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -9,9 +9,9 @@ climate_ref_celery/celeryconf/__init__.py,sha256=xKcHhnECGZAxrjnMtfaPBU_vgqwRbRL
 climate_ref_celery/celeryconf/base.py,sha256=uXaz9S_1hCdwKpvyWBDWE69YVIXHD3Ar7egNKLk9Gx8,484
 climate_ref_celery/celeryconf/dev.py,sha256=um7hvEhlTBfwey9ler_vAHAln_DrpqAP3fbbO2wdmUQ,217
 climate_ref_celery/celeryconf/prod.py,sha256=HyGTfwTZD8MjIkfkb3qyfzjjTPE9sKAoXNq3fJDFO9Q,231
-climate_ref_celery-0.5.5.dist-info/METADATA,sha256=BMcKraPKYJSqJRNnpjG5ZW7B4-emDHQw1XNnyX2eFoM,3662
-climate_ref_celery-0.5.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-climate_ref_celery-0.5.5.dist-info/entry_points.txt,sha256=U9b-T6EpLV3ZXmHUpEzp8x5TZnCjQ1ynncIkFMwDuPE,58
-climate_ref_celery-0.5.5.dist-info/licenses/LICENCE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-climate_ref_celery-0.5.5.dist-info/licenses/NOTICE,sha256=4qTlax9aX2-mswYJuVrLqJ9jK1IkN5kSBqfVvYLF3Ws,128
-climate_ref_celery-0.5.5.dist-info/RECORD,,
+climate_ref_celery-0.6.1.dist-info/METADATA,sha256=mjhMY2EWr_pWFiPN4bx9TX1Lr3OG3aV7P8Z8Ik9H0Bg,3693
+climate_ref_celery-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+climate_ref_celery-0.6.1.dist-info/entry_points.txt,sha256=U9b-T6EpLV3ZXmHUpEzp8x5TZnCjQ1ynncIkFMwDuPE,58
+climate_ref_celery-0.6.1.dist-info/licenses/LICENCE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+climate_ref_celery-0.6.1.dist-info/licenses/NOTICE,sha256=4qTlax9aX2-mswYJuVrLqJ9jK1IkN5kSBqfVvYLF3Ws,128
+climate_ref_celery-0.6.1.dist-info/RECORD,,