From 1ad8365bf2c3f1e3642f2112d70771bccd7491de Mon Sep 17 00:00:00 2001 From: s3lph Date: Sun, 23 Jul 2023 20:27:24 +0200 Subject: [PATCH] fix: ci --- .woodpecker.yml | 6 +++--- tlsrpt_exporter/__main__.py | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index d6df94c..ba2f7e2 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -7,9 +7,9 @@ pipeline: group: test commands: - pip3 install -e .[test] - - python3 -m unittest coverage run --rcfile=setup.cfg -m unittest discover tlsrpt_exporter - - python3 -m unittest coverage combine - - python3 -m unittest coverage report --rcfile=setup.cfg + - python3 -m coverage run --rcfile=setup.cfg -m unittest discover tlsrpt_exporter + - python3 -m coverage combine + - python3 -m coverage report --rcfile=setup.cfg codestyle: image: python:3.11-bookworm diff --git a/tlsrpt_exporter/__main__.py b/tlsrpt_exporter/__main__.py index 5bf7ea9..187f60b 100644 --- a/tlsrpt_exporter/__main__.py +++ b/tlsrpt_exporter/__main__.py @@ -39,7 +39,8 @@ class Reporter(bottle.Bottle): prefix += f'{count_s},{count_f};' if domain is None: return - with open(os.path.join(self.datadir, 'reports', prefix[:-1] + '+' + domain + '+' + data['report-id']), 'w') as f: + fname = os.path.join(self.datadir, 'reports', prefix[:-1] + '+' + domain + '+' + data['report-id']) + with open(fname, 'w') as f: json.dump(data, f) def report(self): @@ -47,7 +48,7 @@ class Reporter(bottle.Bottle): bottle.response.add_header('Accept', 'application/tlsrpt+json') if 'application/tlsrpt+gzip' in bottle.request.content_type: self.handle(self.decompress(bottle.request.body)) - elif 'application/tlsrpt+json' in bottle.request.content_type: + elif 'application/tlsrpt+json' in bottle.request.content_type: self.handle(json.load(bottle.request.body)) else: bottle.response.status = 406 @@ -69,7 +70,7 @@ class Metrics(bottle.Bottle): self.count_f[domain] = self.count_f.setdefault(domain, 0) + count_f self.count[domain] = self.count.setdefault(domain, 0) + 1 - def load_reports(self): + def load_reports(self): for report in os.listdir(os.path.join(self.datadir, 'reports')): if report.startswith('.'): continue @@ -163,7 +164,8 @@ def main(): ap.add_argument('--host', '-H', type=str, default='::', help='Address to bind to') ap.add_argument('--port', '-p', type=int, default=9123, help='Port to bind to') ap.add_argument('--base-url', '-B', type=str, default=None, help='Base URL') - ap.add_argument('--data-dir', '-d', type=str, default='/tmp/prometheus-tlsrpt-exporter', help='Directory to save reports to') + ap.add_argument('--data-dir', '-d', type=str, + default='/tmp/prometheus-tlsrpt-exporter', help='Directory to save reports to') ap.add_argument('--template-dir', '-t', type=str, default='templates', help='Directory to load templates from') ns = ap.parse_args() os.makedirs(os.path.join(ns.data_dir, 'reports'), exist_ok=True)