beanqueue 0.2.1__tar.gz → 0.2.3__tar.gz

{beanqueue-0.2.1 → beanqueue-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: beanqueue
-Version: 0.2.1
+Version: 0.2.3
 Summary: BeanQueue or BQ for short, PostgreSQL SKIP LOCK based worker queue library
 License: MIT
 Author: Fang-Pen Lin

{beanqueue-0.2.1 → beanqueue-0.2.3}/bq/app.py

@@ -8,6 +8,7 @@ import threading
 import time
 import typing
 from wsgiref.simple_server import make_server
+from wsgiref.simple_server import WSGIRequestHandler
 
 import venusian
 from sqlalchemy import func
@@ -31,6 +32,21 @@ from .utils import load_module_var
 logger = logging.getLogger(__name__)
 
 
+class WSGIRequestHandlerWithLogger(WSGIRequestHandler):
+    logger = logging.getLogger("metrics_server")
+
+    def log_message(self, format, *args):
+        message = format % args
+        self.logger.info(
+            "%s - - [%s] %s\n"
+            % (
+                self.address_string(),
+                self.log_date_time_string(),
+                message.translate(self._control_char_table),
+            )
+        )
+
+
 class BeanQueue:
     def __init__(
         self,
@@ -213,7 +229,10 @@ class BeanQueue:
         host = self.config.METRICS_HTTP_SERVER_INTERFACE
         port = self.config.METRICS_HTTP_SERVER_PORT
         with make_server(
-            host, port, functools.partial(self._serve_http_request, worker_id)
+            host,
+            port,
+            functools.partial(self._serve_http_request, worker_id),
+            handler_class=WSGIRequestHandlerWithLogger,
         ) as httpd:
             logger.info("Run metrics HTTP server on %s:%s", host, port)
             httpd.serve_forever()
@@ -255,6 +274,9 @@ class BeanQueue:
 
         metrics_server_thread = None
         if self.config.METRICS_HTTP_SERVER_ENABLED:
+            WSGIRequestHandlerWithLogger.logger.setLevel(
+                self.config.METRICS_HTTP_SERVER_LOG_LEVEL
+            )
             metrics_server_thread = threading.Thread(
                 target=self.run_metrics_http_server,
                 args=(worker.id,),

{beanqueue-0.2.1 → beanqueue-0.2.3}/bq/config.py

@@ -39,6 +39,9 @@ class Config(BaseSettings):
     # the metrics http server port to listen
     METRICS_HTTP_SERVER_PORT: int = 8000
 
+    # default log level for metrics http server
+    METRICS_HTTP_SERVER_LOG_LEVEL: int = 30
+
     POSTGRES_SERVER: str = "localhost"
     POSTGRES_USER: str = "bq"
     POSTGRES_PASSWORD: str = ""

{beanqueue-0.2.1 → beanqueue-0.2.3}/bq/events.py

@@ -1,3 +1,5 @@
 import blinker
 
 worker_init = blinker.signal("worker-init")
+
+task_failure = blinker.signal("task-failure")

{beanqueue-0.2.1 → beanqueue-0.2.3}/bq/models/task.py

@@ -85,6 +85,8 @@ class Task(TaskModelMixin, TaskModelRefWorkerMixin, Base):
             ("id", self.id),
             ("state", self.state),
             ("channel", self.channel),
+            ("module", self.module),
+            ("func_name", self.func_name),
         ]
         return f"<{self.__class__.__name__} {make_repr_attrs(items)}>"
 

{beanqueue-0.2.1 → beanqueue-0.2.3}/bq/models/worker.py

@@ -2,7 +2,6 @@ import datetime
 import enum
 import uuid
 
-from sqlalchemy import Column
 from sqlalchemy import DateTime
 from sqlalchemy import Enum
 from sqlalchemy import func
@@ -12,7 +11,6 @@ from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import declared_attr
 from sqlalchemy.orm import Mapped
 from sqlalchemy.orm import mapped_column
-from sqlalchemy.orm import Mapper
 from sqlalchemy.orm import relationship
 
 from ..db.base import Base

{beanqueue-0.2.1 → beanqueue-0.2.3}/bq/processors/processor.py

@@ -5,6 +5,7 @@ import typing
 
 from sqlalchemy.orm import object_session
 
+from .. import events
 from .. import models
 
 logger = logging.getLogger(__name__)
@@ -36,6 +37,7 @@ class Processor:
                 result = self.func(**base_kwargs, **task.kwargs)
             except Exception as exc:
                 logger.error("Unhandled exception for task %s", task.id, exc_info=True)
+                events.task_failure.send(self, task=task, exception=exc)
                 if self.auto_rollback_on_exc:
                     savepoint.rollback()
                 # TODO: add error event

{beanqueue-0.2.1 → beanqueue-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "beanqueue"
-version = "0.2.1"
+version = "0.2.3"
 description = "BeanQueue or BQ for short, PostgreSQL SKIP LOCK based worker queue library"
 authors = ["Fang-Pen Lin <fangpen@launchplatform.com>"]
 license = "MIT"