From c932892dbd33d320ea40f617986c54d9f2ee37b5 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Sat, 25 Mar 2017 21:16:07 +0100 Subject: [PATCH] Fix bugs in metrics tooling --- src/pretix/base/metrics.py | 2 +- src/pretix/base/views/metrics.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pretix/base/metrics.py b/src/pretix/base/metrics.py index 21efe96192..4105fa30b2 100755 --- a/src/pretix/base/metrics.py +++ b/src/pretix/base/metrics.py @@ -43,7 +43,7 @@ class Metric(object): else: named_labels = [] for labelname in self.labelnames: - named_labels.append('{}="{}",'.format(labelname, labels[labelname])) + named_labels.append('{}="{}"'.format(labelname, labels[labelname])) return metricname + "{" + ",".join(named_labels) + "}" diff --git a/src/pretix/base/views/metrics.py b/src/pretix/base/views/metrics.py index 7338dda6c3..3dcc97231e 100644 --- a/src/pretix/base/views/metrics.py +++ b/src/pretix/base/views/metrics.py @@ -1,3 +1,4 @@ +import base64 import hmac from django.conf import settings @@ -26,7 +27,7 @@ def serve_metrics(request): if method.lower() != "basic": return unauthed_response() - user, passphrase = credentials.strip().decode("base64").split(":", 1) + user, passphrase = base64.b64decode(credentials.strip()).decode().split(":", 1) if not hmac.compare_digest(user, settings.METRICS_USER): return unauthed_response() @@ -37,7 +38,7 @@ def serve_metrics(request): m = metrics.metric_values() output = [] - for metric, value in m: + for metric, value in m.items(): output.append("{} {}".format(metric, str(value))) content = "\n".join(output)