Merge pull request #2103 from camptocamp/fix-none

Fix TypeError: 'NoneType' object is not iterable
camptocamp · Jan 10, 2024 · 1261a92 · 1261a92
2 parents 819314a + 59e14fc
commit 1261a92
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/c2cwsgiutils/prometheus.py b/c2cwsgiutils/prometheus.py
@@ -132,6 +132,9 @@ def _deserialize_collected_data(
     results: list[list[SerializedMetric]],
 ) -> Generator[prometheus_client.core.Metric, None, None]:
     for serialized_collection in results:
+        if serialized_collection is None:
+            continue
+
         for serialized_metric in serialized_collection:
             if serialized_metric is None:
                 continue

diff --git a/c2cwsgiutils/redis_utils.py b/c2cwsgiutils/redis_utils.py
@@ -118,7 +118,7 @@ def run(self) -> None:
                     last_was_ok = True
             except redis.exceptions.RedisError:
                 if last_was_ok:
-                    LOG.warning("Redis connection problem", exc_info=True)
+                    LOG.warning("Redis connection problem")
                 last_was_ok = False
                 time.sleep(0.5)
             except Exception:  # pylint: disable=broad-except