From c1cf91ee1dca14fcf9dd0c92a249e88dbd72b16c Mon Sep 17 00:00:00 2001 From: songmeo Date: Fri, 2 Apr 2021 09:17:39 +0000 Subject: [PATCH] rewrite with sanic, motor --- Dockerfile | 2 +- main.py | 38 +++++++++++++++++++------------------- requirements.txt | 2 ++ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index f5320b1..2dda3fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,4 +5,4 @@ COPY requirements.txt ./ RUN pip install -r requirements.txt COPY *.py ./ -CMD ["gunicorn", "--workers", "10", "--bind", "[::]:5000", "main:app", "--timeout", "90"] +CMD ["gunicorn", "--worker-class", "sanic.worker.GunicornWorker", "--workers", "10", "--bind", "[::]:5000", "main:app", "--timeout", "90"] diff --git a/main.py b/main.py index 29025a3..26785b4 100644 --- a/main.py +++ b/main.py @@ -1,18 +1,20 @@ from datetime import datetime -from flask import Flask, request, redirect, render_template, Blueprint, make_response, jsonify -from pymongo import MongoClient -import flask +from sanic import Sanic, response +import uvloop, asyncio +from motor.motor_asyncio import AsyncIOMotorClient +import pymongo import hashlib import jinja2 import json import os -import pymongo import smtplib import const -app = Flask(__name__) +app = Sanic(__name__) +asyncio.set_event_loop_policy(uvloop.EventLoopPolicy()) # swap default event loop to uvloop + #mongodb = MongoClient('mongodb://172.21.27.1,172.21.27.2,172.21.27.3:27017/', replicaSet="kspace-mongo-set").kspace_accounting -mongodb = MongoClient(const.MONGO_URI) +mongodb = AsyncIOMotorClient(const.MONGO_URI) mongodb = mongodb.get_default_database() DOORBOY_SECRET = os.environ["DOORBOY_SECRET"] @@ -20,25 +22,25 @@ DOORBOY_SECRET = os.environ["DOORBOY_SECRET"] assert len(DOORBOY_SECRET) > 10 @app.route("/allowed") -def view_doorboy_uids(): +async def view_doorboy_uids(request): if request.headers.get('KEY') != DOORBOY_SECRET: return "how about no" - allowed_names = [o["_id"] for o in mongodb.member.find({"enabled": True})] + allowed_names = [o["_id"] for o in await mongodb.member.find({"enabled": True}).to_list()] allowed_uids = [] - for obj in mongodb.inventory.find({"token.uid_hash": {"$exists":True}, "inventory.owner_id": {"$exists":True}, "token.enabled": True}, {"inventory.owner_id": True, "token.uid_hash": True }): + for obj in await mongodb.inventory.find({"token.uid_hash": {"$exists":True}, "inventory.owner_id": {"$exists":True}, "token.enabled": True}, {"inventory.owner_id": True, "token.uid_hash": True }): if obj["inventory"].pop("owner_id") in allowed_names: - obj.pop("_id") - obj.pop("inventory") + del obj["_id"] + del obj["inventory"] allowed_uids.append(obj) - return jsonify(allowed_uids=allowed_uids) + return response.json(allowed_uids=allowed_uids) @app.route("/longpoll") -def view_longpoll(): +async def view_longpoll(request): if request.headers.get('KEY') != DOORBOY_SECRET: return "how about no" - def g(): + async def g(): yield "data: response-generator-started\n\n" pipeline = [ { @@ -50,16 +52,14 @@ def view_longpoll(): } ] try: - with mongodb.eventlog.watch(pipeline) as stream: + async with mongodb.eventlog.watch(pipeline) as stream: yield "data: watch-stream-opened\n\n" - for event in stream: + async for event in stream: if event["fullDocument"].get("type") == "open-door": yield "data: %s\n\n" % event["fullDocument"]["door"] except pymongo.errors.PyMongoError: return "urror" - return flask.Response(g(), - mimetype="text/event-stream") + return stream(g, content_type="text/event-stream") if __name__ == '__main__': app.run(debug=False, host='::') - diff --git a/requirements.txt b/requirements.txt index 2df0789..5e3178d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,5 @@ Flask Flask-WTF pymongo gunicorn +sanic +motor