c2cwsgiutils 5.2.4__tar.gz → 5.2.5__tar.gz

{c2cwsgiutils-5.2.4 → c2cwsgiutils-5.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cwsgiutils
-Version: 5.2.4
+Version: 5.2.5
 Summary: Common utilities for Camptocamp WSGI applications
 Home-page: https://github.com/camptocamp/c2cwsgiutils
 License: BSD-2-Clause

{c2cwsgiutils-5.2.4 → c2cwsgiutils-5.2.5}/c2cwsgiutils/redis_utils.py

@@ -17,12 +17,16 @@ REDIS_OPTIONS_KEY = "C2C_REDIS_OPTIONS"
 REDIS_SENTINELS_KEY = "C2C_REDIS_SENTINELS"
 REDIS_SERVICENAME_KEY = "C2C_REDIS_SERVICENAME"
 REDIS_DB_KEY = "C2C_REDIS_DB"
+_REDIS_PUBSUB_RETRY_DELAY_KEY = "C2C_REDIS_PUBSUB_RETRY_DELAY"
+_REDIS_PUBSUB_GET_MESSAGE_TIMEOUT_KEY = "C2C_REDIS_PUBSUB_GET_MESSAGE_TIMEOUT"
 
 REDIS_URL_KEY_PROP = "c2c.redis_url"
 REDIS_OPTIONS_KEY_PROP = "c2c.redis_options"
 REDIS_SENTINELS_KEY_PROP = "c2c.redis_sentinels"
 REDIS_SERVICENAME_KEY_PROP = "c2c.redis_servicename"
 REDIS_DB_KEY_PROP = "c2c.redis_db"
+_REDIS_PUBSUB_RETRY_DELAY_KEY_PROP = "c2c.redis_pubsub_retry_delay"
+_REDIS_PUBSUB_GET_MESSAGE_TIMEOUT_KEY_PROP = "c2c.redis_pubsub_get_message_timeout"
 
 _master: Optional["redis.client.Redis[str]"] = None
 _slave: Optional["redis.client.Redis[str]"] = None
@@ -93,10 +97,30 @@ def _init(settings: Optional[Mapping[str, Any]]) -> None:
 class PubSubWorkerThread(threading.Thread):
     """A clone of redis.client.PubSubWorkerThread that doesn't die when the connections are broken."""
 
-    def __init__(self, pubsub: redis.client.PubSub, name: Optional[str] = None) -> None:
+    def __init__(
+        self,
+        pubsub: redis.client.PubSub,
+        name: str | None = None,
+        settings: Mapping[str, Any] | None = None,
+    ) -> None:
+        """Initialize the PubSubWorkerThread."""
         super().__init__(name=name, daemon=True)
         self.pubsub = pubsub
         self._running = False
+        self._retry_delay = c2cwsgiutils.config_utils.env_or_settings(
+            settings,
+            _REDIS_PUBSUB_RETRY_DELAY_KEY,
+            _REDIS_PUBSUB_RETRY_DELAY_KEY_PROP,
+            0.5,
+            float,
+        )
+        self._get_message_timeout = c2cwsgiutils.config_utils.env_or_settings(
+            settings,
+            _REDIS_PUBSUB_GET_MESSAGE_TIMEOUT_KEY,
+            _REDIS_PUBSUB_GET_MESSAGE_TIMEOUT_KEY_PROP,
+            1.0,
+            float,
+        )
 
     def run(self) -> None:
         if self._running:
@@ -106,15 +130,15 @@ class PubSubWorkerThread(threading.Thread):
         last_was_ok = True
         while pubsub.subscribed:
             try:
-                pubsub.get_message(ignore_subscribe_messages=True, timeout=1)
+                pubsub.get_message(ignore_subscribe_messages=True, timeout=self._get_message_timeout)
                 if not last_was_ok:
-                    LOG.info("Redis is back")
+                    LOG.debug("Redis is back")
                     last_was_ok = True
             except redis.exceptions.RedisError:
                 if last_was_ok:
-                    LOG.warning("Redis connection problem", exc_info=True)
+                    LOG.debug("Redis connection problem")
                 last_was_ok = False
-                time.sleep(0.5)
+                time.sleep(self._retry_delay)
             except Exception:  # pylint: disable=broad-except
                 LOG.warning("Unexpected error", exc_info=True)
         LOG.info("Redis subscription worker stopped")

{c2cwsgiutils-5.2.4 → c2cwsgiutils-5.2.5}/pyproject.toml

@@ -21,7 +21,7 @@ strict = true
 
 [tool.poetry]
 name = "c2cwsgiutils"
-version = "5.2.4"
+version = "5.2.5"
 description = "Common utilities for Camptocamp WSGI applications"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]
@@ -68,8 +68,8 @@ sentry = "c2cwsgiutils.sentry:filter_factory"
 
 [tool.poetry.dependencies]
 python = ">=3.8,<3.12"
-requests = "2.32.3"
-pyyaml = { version = "6.0.2" }
+requests = "2.32.4"
+pyyaml = { version = "6.0.3" }
 alembic = { version = "1.9.4", optional = true }
 boltons = { version = "21.0.0", optional = true }
 cornice = { version = "6.0.1", optional = true }
@@ -84,7 +84,7 @@ pyramid-tm = { version = "2.5", optional = true }
 sentry-sdk = "2.8.0"
 ujson = { version = "5.7.0", optional = true }
 cee_syslog_handler = { version = "0.6.0", optional = true }
-SQLAlchemy = { version = "2.0.36", optional = true }
+SQLAlchemy = { version = "2.0.46", optional = true }
 SQLAlchemy-Utils = { version = "0.39.0", optional = true }
 "zope.interface" = { version = "5.5.2", optional = true }
 "zope.sqlalchemy" = { version = "1.6", optional = true }
@@ -92,7 +92,7 @@ pyjwt = { version = "2.6.0", optional = true }
 requests-oauthlib = { version = "1.3.1", optional = true }
 waitress = { version = "2.1.2", optional = true }
 scikit-image = { version = "0.19.3", optional = true }
-certifi = "2024.7.4"
+certifi = "2026.2.25"
 scipy = { version = "1.10.1", optional = true }
 pillow = { version = "10.3.0", optional = true }
 urllib3 = "1.26.20"
@@ -158,7 +158,7 @@ junit2html = "30.1.6"
 pytest = "7.2.2"
 pytest-cov = "4.0.0"
 pytest-html = "3.2.0"
-types-pyyaml = "6.0.12.20240917"
+types-pyyaml = "6.0.12.20241230"
 types-requests = "2.28.11.17"
 types-redis = "4.4.0.6"
 types-ujson = "5.7.0.5"