c2cwsgiutils 6.2.0.dev374__tar.gz → 6.2.0.dev376__tar.gz

{c2cwsgiutils-6.2.0.dev374 → c2cwsgiutils-6.2.0.dev376}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: c2cwsgiutils
-Version: 6.2.0.dev374
+Version: 6.2.0.dev376
 Summary: Common utilities for Camptocamp WSGI applications
 License-Expression: BSD-2-Clause
 License-File: LICENSE

{c2cwsgiutils-6.2.0.dev374 → c2cwsgiutils-6.2.0.dev376}/c2cwsgiutils/sqlalchemylogger/README.md

@@ -63,3 +63,33 @@ if __name__ == '__main__':
     # logs after a timeout
     time.sleep(2)
 ```
+
+## Use with forking server (ex: `gunicorn`)
+
+Snippet for configuration with `gunicorn` and `paste`:
+
+`production.ini`:
+
+```
+[handler_sqlalchemylogger]
+class = c2cwsgiutils.sqlalchemylogger.handlers.SQLAlchemyHandler
+args = ({'url':'postgresql://','tablename':'logs','tableargs': {'schema':'logs'}, 'delay_startup': True},'healthcheck')
+level = NOTSET
+formatter = generic
+propagate = 0
+```
+
+`gunicorn.conf.py`:
+
+```python
+def post_fork(server, worker):
+    import logging
+    logger = logging.getHandlerByName('sqlalchemylogger')
+    logger.start()
+```
+
+The gunicorn must be started with this config file:
+
+```bash
+gunicorn -c gunicorn.conf.py [...]
+```

{c2cwsgiutils-6.2.0.dev374 → c2cwsgiutils-6.2.0.dev376}/c2cwsgiutils/sqlalchemylogger/handlers.py

@@ -36,6 +36,29 @@ class SQLAlchemyHandler(logging.Handler):
     ) -> None:
         """Initialize the SQLAlchemyHandler."""
         super().__init__()
+
+        self.started = False
+        if sqlalchemy_url.get("delay_startup", False):
+            self.sqlalchemy_url = sqlalchemy_url
+            self.does_not_contain_expression = does_not_contain_expression
+            self.contains_expression = contains_expression
+        else:
+            self._start(sqlalchemy_url, does_not_contain_expression, contains_expression)
+
+    def start(self) -> None:
+        """Force startup of logger in case of delayed startup."""
+        self._start(self.sqlalchemy_url, self.does_not_contain_expression, self.contains_expression)
+
+    def _start(
+        self,
+        sqlalchemy_url: dict[str, str],
+        does_not_contain_expression: str,
+        contains_expression: str,
+    ) -> None:
+        if self.started:
+            # only start once
+            return
+
         # Initialize DB session
         self.engine = create_engine(sqlalchemy_url["url"])
         self.Log = create_log_class(  # pylint: disable=invalid-name
@@ -55,6 +78,7 @@ class SQLAlchemyHandler(logging.Handler):
             self.addFilter(DoesNotContainExpression(does_not_contain_expression))
         if contains_expression:
             self.addFilter(ContainsExpression(contains_expression))
+        self.started = True
 
     def _processor(self) -> None:
         _LOG.debug("%s: starting processor thread", __name__)

{c2cwsgiutils-6.2.0.dev374 → c2cwsgiutils-6.2.0.dev376}/pyproject.toml

@@ -54,7 +54,7 @@ SQLAlchemy = { version = "2.0.52", optional = true }
 SQLAlchemy-Utils = { version = "0.42.1", optional = true }
 "zope.interface" = { version = "8.6", optional = true }
 "zope.sqlalchemy" = { version = "4.1", optional = true }
-pyjwt = { version = "2.13.0", optional = true }
+pyjwt = { version = "2.14.0", optional = true }
 requests-oauthlib = { version = "2.0.0", optional = true }
 waitress = { version = "3.0.2", optional = true }
 scikit-image = { version = "0.26.0", optional = true }
@@ -229,7 +229,7 @@ include = [
 ]
 requires-python = ">=3.11"
 dependencies = ["requests", "pyyaml", "ujson", "cee_syslog_handler", "prometheus-client", "setuptools<81.0.0"]
-version = "6.2.0.dev374"
+version = "6.2.0.dev376"
 
 [project.urls]
 repository = "https://github.com/camptocamp/c2cwsgiutils"