polyswarm-engine 3.2.1__tar.gz → 3.2.2__tar.gz

{polyswarm_engine-3.2.1 → polyswarm_engine-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyswarm_engine
-Version: 3.2.1
+Version: 3.2.2
 Summary: Polyswarm engine libarary
 Author-email: Polyswarm Developers <developers@polyswarm.io>
 Project-URL: Homepage, https://github.com/polyswarm/polyswarm_engine

{polyswarm_engine-3.2.1 → polyswarm_engine-3.2.2}/polyswarm_engine/__init__.py

@@ -1,5 +1,5 @@
 # flake8: noqa
-__VERSION__ = '3.2.1'
+__VERSION__ = '3.2.2'
 
 from .bidutils import (
     bid_max,

{polyswarm_engine-3.2.1 → polyswarm_engine-3.2.2}/polyswarm_engine/celeryconfig.py

@@ -1,11 +1,20 @@
 import functools
 import importlib
+import io
+import os
+import sys
+import logging
 
+from celery.apps.worker import Worker
 from celery.worker.consumer import mingle, gossip
 from celery.worker.worker import WorkController
+import click
 
 import polyswarm_engine.settings
 
+logger = logging.getLogger(__name__)
+
+
 # monkey patch to enable -Ofair, the most stable during our tests
 _original_setup_defaults = WorkController.setup_defaults
 @functools.wraps(WorkController.setup_defaults)
@@ -17,6 +26,25 @@ WorkController.setup_defaults = _new_setup_defaults
 mingle.Mingle.compatible_transports = {}
 gossip.Gossip.compatible_transports = {}
 
+
+# monkey patch to make emit_banner use logging instead of print(sys.__stdout__)
+_original_emit_banner = Worker.emit_banner
+@functools.wraps(Worker.emit_banner)
+def _log_emit_banner(self):
+    original_stdout = sys.__stdout__
+    sys.__stdout__ = buffer = io.StringIO()
+    try:
+        _original_emit_banner(self)
+    finally:
+        sys.__stdout__ = original_stdout
+    banner_text = buffer.getvalue()
+    if os.getenv('LOG_FORMAT') == 'json':
+        # Celery outputs the banner as Cyan via ASCII terminal magic
+        banner_text = click.unstyle(banner_text)
+    logger.info(banner_text.lstrip())
+Worker.emit_banner = _log_emit_banner
+
+
 ##########################################
 # Celery Configuration
 ##########################################

{polyswarm_engine-3.2.1 → polyswarm_engine-3.2.2}/polyswarm_engine/log_config.py

@@ -86,7 +86,7 @@ def get_logging(log_level=None, handler='console'):
             'click': {
                 'level': log_level,
                 'class': 'click_log.core.ClickHandler',
-                'formatter': 'click',
+                'formatter': 'click' if LOG_FORMAT == 'text' else LOG_FORMAT,
             },
         },
         'loggers': {

{polyswarm_engine-3.2.1 → polyswarm_engine-3.2.2}/polyswarm_engine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyswarm_engine
-Version: 3.2.1
+Version: 3.2.2
 Summary: Polyswarm engine libarary
 Author-email: Polyswarm Developers <developers@polyswarm.io>
 Project-URL: Homepage, https://github.com/polyswarm/polyswarm_engine

{polyswarm_engine-3.2.1 → polyswarm_engine-3.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "polyswarm_engine"
-version = "3.2.1"
+version = "3.2.2"
 description = "Polyswarm engine libarary"
 readme = "README.md"
 authors = [
@@ -101,7 +101,7 @@ split_before_dot = "true"
 include-package-data = false
 
 [tool.bumpversion]
-current_version = "3.2.1"
+current_version = "3.2.2"
 commit = true
 tag = false
 sign_tags = true