c2cwsgiutils 6.0.0.dev88__tar.gz → 6.0.0.dev93__tar.gz

{c2cwsgiutils-6.0.0.dev88 → c2cwsgiutils-6.0.0.dev93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cwsgiutils
-Version: 6.0.0.dev88
+Version: 6.0.0.dev93
 Summary: Common utilities for Camptocamp WSGI applications
 Home-page: https://github.com/camptocamp/c2cwsgiutils
 License: BSD-2-Clause
@@ -483,14 +483,14 @@ command line. Usually done in the [Dockerfile](acceptance_tests/app/Dockerfile)
 It will work in multi process mode with the limitation listed in the
 [`prometheus_client` documentation](https://github.com/prometheus/client_python#multiprocess-mode-eg-gunicorn).
 
-To enable it you should provide the `PROMETHEUS_PORT` environment variable.
+To enable it you should provide the `C2CWSGIUTILS_PROMETHEUS_PORT` environment variable.
 For security reason, this port should not be exposed.
 
 We can customize it with the following environment variables:
 
-- `PROMETHEUS_PREFIX`: to customize the prefix, default is `c2cwsggiutils-`.
+- `C2C_PROMETHEUS_PREFIX`: to customize the prefix, default is `c2cwsggiutils-`.
 - `C2C_PROMETHEUS_PACKAGES` the packages that will be present in the version information, default is `c2cwsgiutils,pyramid,gunicorn,sqlalchemy`.
-- `C2C_PROMETHEUS_APPLICATION_PACKAGES` the packages that will be present in the version information as application.
+- `C2C_PROMETHEUS_APPLICATION_PACKAGE` the packages that will be present in the version information as application.
 
 And you should add in your `gunicorn.conf.py`:
 

{c2cwsgiutils-6.0.0.dev88 → c2cwsgiutils-6.0.0.dev93}/README.md

@@ -423,14 +423,14 @@ command line. Usually done in the [Dockerfile](acceptance_tests/app/Dockerfile)
 It will work in multi process mode with the limitation listed in the
 [`prometheus_client` documentation](https://github.com/prometheus/client_python#multiprocess-mode-eg-gunicorn).
 
-To enable it you should provide the `PROMETHEUS_PORT` environment variable.
+To enable it you should provide the `C2CWSGIUTILS_PROMETHEUS_PORT` environment variable.
 For security reason, this port should not be exposed.
 
 We can customize it with the following environment variables:
 
-- `PROMETHEUS_PREFIX`: to customize the prefix, default is `c2cwsggiutils-`.
+- `C2C_PROMETHEUS_PREFIX`: to customize the prefix, default is `c2cwsggiutils-`.
 - `C2C_PROMETHEUS_PACKAGES` the packages that will be present in the version information, default is `c2cwsgiutils,pyramid,gunicorn,sqlalchemy`.
-- `C2C_PROMETHEUS_APPLICATION_PACKAGES` the packages that will be present in the version information as application.
+- `C2C_PROMETHEUS_APPLICATION_PACKAGE` the packages that will be present in the version information as application.
 
 And you should add in your `gunicorn.conf.py`:
 

{c2cwsgiutils-6.0.0.dev88 → c2cwsgiutils-6.0.0.dev93}/c2cwsgiutils/prometheus.py

@@ -24,7 +24,7 @@ MULTI_PROCESS_COLLECTOR_BROADCAST_CHANNELS = [
 def start(registry: Optional[prometheus_client.CollectorRegistry] = None) -> None:
     """Start separate HTTP server to provide the Prometheus metrics."""
 
-    if os.environ.get("PROMETHEUS_PORT") is not None:
+    if os.environ.get("C2C_PROMETHEUS_PORT") is not None:
         broadcast.includeme()
 
         registry = prometheus_client.CollectorRegistry() if registry is None else registry
@@ -32,7 +32,7 @@ def start(registry: Optional[prometheus_client.CollectorRegistry] = None) -> Non
         registry.register(prometheus_client.PLATFORM_COLLECTOR)
         registry.register(MultiProcessCustomCollector())
         prometheus_client.multiprocess.MultiProcessCollector(registry)  # type: ignore[no-untyped-call]
-        prometheus_client.start_http_server(int(os.environ["PROMETHEUS_PORT"]), registry=registry)
+        prometheus_client.start_http_server(int(os.environ["C2C_PROMETHEUS_PORT"]), registry=registry)
 
 
 def includeme(config: pyramid.config.Configurator) -> None:
@@ -45,7 +45,7 @@ def includeme(config: pyramid.config.Configurator) -> None:
 def build_metric_name(postfix: str) -> str:
     """Build the metric name with the prefix from the environment variable."""
 
-    return os.environ.get("PROMETHEUS_PREFIX", "c2cwsgiutils_") + postfix
+    return os.environ.get("C2C_PROMETHEUS_PREFIX", "c2cwsgiutils_") + postfix
 
 
 def cleanup() -> None:

{c2cwsgiutils-6.0.0.dev88 → c2cwsgiutils-6.0.0.dev93}/c2cwsgiutils/scripts/stats_db.py

@@ -92,10 +92,10 @@ class Reporter:
         if self.prometheus_push:
             push_to_gateway(self.args.prometheus_url, job="db_counts", registry=self.registry)
         else:
-            port = int(os.environ.get("PROMETHEUS_PORT", "9090"))
+            port = int(os.environ.get("C2C_PROMETHEUS_PORT", "9090"))
             app = make_wsgi_app(self.registry)
             with make_server("", port, app) as httpd:
-                print(f"Waiting that Prometheus get the metrics served on port {port}...")
+                LOG.info("Waiting that Prometheus get the metrics served on port %s...", port)
                 httpd.handle_request()
 
     def error(self, metric: List[str], error_: Exception) -> None:
@@ -288,7 +288,7 @@ def main() -> None:
     """Run the command."""
     success = False
     args = _parse_args()
-    c2cwsgiutils.setup_process.init_logging(args.config_uri)
+    c2cwsgiutils.setup_process.init(args.config_uri)
     for _ in range(int(os.environ.get("C2CWSGIUTILS_STATS_DB_TRYNUMBER", 10))):
         try:
             _do_dtats_db(args)

{c2cwsgiutils-6.0.0.dev88 → c2cwsgiutils-6.0.0.dev93}/c2cwsgiutils/version.py

@@ -14,7 +14,7 @@ _VERSIONS_PATH = "/app/versions.json"
 _LOG = logging.getLogger(__name__)
 
 _PACKAGES = os.environ.get("C2C_PROMETHEUS_PACKAGES", "c2cwsgiutils,pyramid,gunicorn,sqlalchemy").split(",")
-_APPLICATION_PACKAGES = os.environ.get("C2C_PROMETHEUS_APPLICATION_PACKAGES")
+_APPLICATION_PACKAGES = os.environ.get("C2C_PROMETHEUS_APPLICATION_PACKAGE")
 _LABEL_RE_NOT_ALLOWED = re.compile(r"[^a-zA-Z0-9]+")
 
 

{c2cwsgiutils-6.0.0.dev88 → c2cwsgiutils-6.0.0.dev93}/pyproject.toml

@@ -16,7 +16,7 @@ strict = true
 
 [tool.poetry]
 name = "c2cwsgiutils"
-version = "6.0.0.dev88"
+version = "6.0.0.dev93"
 description = "Common utilities for Camptocamp WSGI applications"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]