Merge branch 'exception' into 'master'

Bare exception handling

Closes #4 and #5

See merge request sum7/ejabberd-tools!7

2 files changed, 5 insertions, 5 deletions

diff --git a/cleanup.py b/cleanup.py
index 671c466..4956f94 100755
--- a/cleanup.py
+++ b/cleanup.py
@@ -38,11 +38,11 @@ class EjabberdCleanup(EjabberdApiCalls):
             lastdate = None
             try:
                 lastdate = datetime.datetime.strptime(last_stamp, "%Y-%m-%dT%H:%M:%SZ")
-            except:  # noqa: E722
+            except ValueError:
                 try:
                     lastdate = datetime.datetime.strptime(last_stamp, "%Y-%m-%dT%H:%M:%S.%fZ")
-                except:  # noqa: E722
-                    logging.error(f"{user}@{host}: not able to parse '{last_stamp}'")
+                except ValueError as err:
+                    logging.error(f"{user}@{host}: not able to parse '{last_stamp}': {err}")
                     return
             if lastdate is not None and lastdate - datetime.datetime.now() > datetime.timedelta(
                 days=self.offline_since_days
diff --git a/prometheus.py b/prometheus.py
index a526851..676b6fc 100755
--- a/prometheus.py
+++ b/prometheus.py
@@ -23,8 +23,8 @@ class DynamicMetricsHandler(BaseHTTPRequestHandler):
             registry = registry.restricted_registry(params["name[]"])
         try:
             output = generate_latest(registry)
-        except:  # noqa: E722
-            self.send_error(500, "error generating metric output")
+        except Exception as exception:
+            self.send_error(500, f"error generating metric output: {exception}")
             raise
         self.send_response(200)
         self.send_header("Content-Type", CONTENT_TYPE_LATEST)