aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md6
-rw-r--r--api.py2
-rwxr-xr-xcleanup.py6
-rw-r--r--influx.py4
-rwxr-xr-xprometheus.py2
5 files changed, 10 insertions, 10 deletions
diff --git a/README.md b/README.md
index 7cbd2cf..ac33b00 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ listen:
acl:
api:
- user:
+ user:
- "api_user@magicbroccoli.de"
loopback:
ip:
@@ -59,7 +59,7 @@ acl:
api_permissions:
"api access":
from:
- - mod_http_api
+ - mod_http_api
who:
access:
allow:
@@ -81,7 +81,7 @@ configuration file should be located at `/etc/ejabberd-metrics.yml`.
#### systemd service
To properly operate the metrics exporter tools, we created some systemd service templates, to simplify the whole
process. If the `ejabberd-metrics.yml` file is not accessible for the user`nobody:nogroup`, it is required to update the
-`User` and `Group` definitions inside the service file.
+`User` and `Group` definitions inside the service file.
If a virtualenv is used, it is required to update the `Environment=PATH` to include the `venv/bin` directory created
earlier.
diff --git a/api.py b/api.py
index 3372976..6b83d2b 100644
--- a/api.py
+++ b/api.py
@@ -53,6 +53,6 @@ class EjabberdApi:
return fn(self._login, data)
return fn(data)
- except:
+ except: # noqa: E722
# this needs to be more specific
return {}
diff --git a/cleanup.py b/cleanup.py
index ee9def1..671c466 100755
--- a/cleanup.py
+++ b/cleanup.py
@@ -38,13 +38,13 @@ class EjabberdCleanup(EjabberdApiCalls):
lastdate = None
try:
lastdate = datetime.datetime.strptime(last_stamp, "%Y-%m-%dT%H:%M:%SZ")
- except:
+ except: # noqa: E722
try:
lastdate = datetime.datetime.strptime(last_stamp, "%Y-%m-%dT%H:%M:%S.%fZ")
- except:
+ except: # noqa: E722
logging.error(f"{user}@{host}: not able to parse '{last_stamp}'")
return
- if lastdate != None and lastdate - datetime.datetime.now() > datetime.timedelta(
+ if lastdate is not None and lastdate - datetime.datetime.now() > datetime.timedelta(
days=self.offline_since_days
):
self.delete_user(host, user, f"last seen @ {lastdate}")
diff --git a/influx.py b/influx.py
index b51d8f5..9437831 100644
--- a/influx.py
+++ b/influx.py
@@ -21,8 +21,8 @@ class Influx:
@staticmethod
def _rmspace(key: str = None, value: (str, int) = None):
try:
- key = key.replace(" ", "\ ")
- value = value.replace(" ", "\ ")
+ key = key.replace(" ", "\ ") # noqa: W605
+ value = value.replace(" ", "\ ") # noqa: W605
except (TypeError, AttributeError):
pass
diff --git a/prometheus.py b/prometheus.py
index 6d7bbe5..a526851 100755
--- a/prometheus.py
+++ b/prometheus.py
@@ -23,7 +23,7 @@ class DynamicMetricsHandler(BaseHTTPRequestHandler):
registry = registry.restricted_registry(params["name[]"])
try:
output = generate_latest(registry)
- except:
+ except: # noqa: E722
self.send_error(500, "error generating metric output")
raise
self.send_response(200)