From 8ce96ac20830ce222fb7f75ef8ab1ad2669539b0 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Wed, 23 Dec 2020 12:53:28 -0800 Subject: swap uvicorn out for hypercorn Signed-off-by: Kevin Morris Signed-off-by: Lukas Fleischer --- .gitlab-ci.yml | 2 +- INSTALL | 3 ++- aurweb/spawn.py | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9dc951aa..aff18a83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ before_script: base-devel git gpgme protobuf pyalpm python-mysql-connector python-pygit2 python-srcinfo python-bleach python-markdown python-sqlalchemy python-alembic python-pytest python-werkzeug - python-pytest-tap python-fastapi uvicorn nginx python-authlib + python-pytest-tap python-fastapi hypercorn nginx python-authlib python-itsdangerous python-httpx test: diff --git a/INSTALL b/INSTALL index 7087aca2..a32d6f5a 100644 --- a/INSTALL +++ b/INSTALL @@ -48,7 +48,8 @@ read the instructions below. 4) Install Python modules and dependencies: # pacman -S python-mysql-connector python-pygit2 python-srcinfo python-sqlalchemy \ - python-bleach python-markdown python-alembic + python-bleach python-markdown python-alembic python-jinja \ + python-itsdangerous python-authlib python-httpx hypercorn # python3 setup.py install 5) Create a new MySQL database and a user and import the aurweb SQL schema: diff --git a/aurweb/spawn.py b/aurweb/spawn.py index 3c5130d7..e10db911 100644 --- a/aurweb/spawn.py +++ b/aurweb/spawn.py @@ -31,6 +31,7 @@ class ProcessExceptions(Exception): Compound exception used by stop() to list all the errors that happened when terminating child processes. """ + def __init__(self, message, exceptions): self.message = message self.exceptions = exceptions @@ -110,9 +111,7 @@ def start(): # FastAPI host, port = aurweb.config.get("fastapi", "bind_address").rsplit(":", 1) - spawn_child(["python", "-m", "uvicorn", - "--host", host, - "--port", port, + spawn_child(["python", "-m", "hypercorn", "-b", f"{host}:{port}", "aurweb.asgi:app"]) # nginx -- cgit v1.2.3-24-g4f1b