From 14955c87e575b56d1bd00fbadd3e9acdf13505fd Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Fri, 11 Nov 2022 18:10:18 +0000
Subject: [PATCH] Misc fixes
---
calparrot/__main__.py | 3 +--
calparrot/proxy.py | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/calparrot/__main__.py b/calparrot/__main__.py
index 8ae2398..a39f4aa 100644
--- a/calparrot/__main__.py
+++ b/calparrot/__main__.py
@@ -20,7 +20,6 @@ def main():
ap = argparse.ArgumentParser()
ap.add_argument('--debug', action='store_true')
ap.add_argument('--db', default='calparrot.sqlite')
- ap.add_argument()
args = ap.parse_args()
logging.basicConfig(level=logging.DEBUG if args.debug else logging.INFO)
@@ -28,7 +27,7 @@ def main():
calcat_cfg = restful_config.get('calcat', {})
calcat_cfg.setdefault('base_url', 'http://exflcalproxy:8080/')
calcat_cfg.setdefault('use_oauth2', False)
- log.info("Upstream is %s (user %s)", calcat_cfg['base_url'], calcat_cfg['user_email'])
+ log.info("Upstream is %s", calcat_cfg['base_url'])
app = make_app(calcat_cfg, args.db)
sockets = bind_sockets(0, '127.0.0.1')
diff --git a/calparrot/proxy.py b/calparrot/proxy.py
index 20de324..602500d 100644
--- a/calparrot/proxy.py
+++ b/calparrot/proxy.py
@@ -196,4 +196,4 @@ def make_app(creds, db_path='calparrot.sqlite'):
async def listen(app):
quit_evt = app.settings['calparrot_quit_event']
- await quit_evt
+ await quit_evt.wait()
--
GitLab