From 69943e41cd95b0cff89efa4277abb6a37e67a9d2 Mon Sep 17 00:00:00 2001 From: Peter Molnar Date: Thu, 30 Nov 2017 17:02:06 +0000 Subject: [PATCH] autopep cleanup --- router.py | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/router.py b/router.py index 057d60d..7dfc783 100644 --- a/router.py +++ b/router.py @@ -1,24 +1,22 @@ #!/usr/bin/env python3 -#import asyncio -#import uvloop from sanic import Sanic import sanic.response -import logging +from sanic.log import log as logging import validators import urllib.parse import shared if __name__ == '__main__': - logging_format = "[%(asctime)s] %(process)d-%(levelname)s " - logging_format += "%(module)s::%(funcName)s():l%(lineno)d: " - logging_format += "%(message)s" + #logging_format = "[%(asctime)s] %(process)d-%(levelname)s " + #logging_format += "%(module)s::%(funcName)s():l%(lineno)d: " + #logging_format += "%(message)s" - logging.basicConfig( - format=logging_format, - level=logging.DEBUG - ) - log = logging.getLogger() + #logging.basicConfig( + #format=logging_format, + #level=logging.DEBUG + #) + #log = logging.getLogger() # log_config=None prevents creation of access_log and error_log files # since I'm running this from systemctl it already goes into syslog @@ -26,18 +24,17 @@ if __name__ == '__main__': # this is ok to be read-only sdb = shared.SearchDB() - @app.route("/oauth1", methods=["GET"]) async def oauth1(request): token = request.args.get('oauth_token') verifier = request.args.get('oauth_verifier') + logging.info("incoming oauth request: token was %s ; verifier was %s", token, verifier) tokendb = shared.TokenDB() tokendb.update_token( token, verifier=verifier ) - return sanic.response.text("OK",status=200) - + return sanic.response.text("OK", status=200) @app.route("/search", methods=["GET"]) async def search(request): @@ -46,12 +43,10 @@ if __name__ == '__main__': response = sanic.response.html(r, status=200) return response - - @app.route("/micropub", methods=["POST","GET"]) + @app.route("/micropub", methods=["POST", "GET"]) async def micropub(request): return sanic.response.text("Not Implemented", status=501) - @app.route("/webmention", methods=["POST"]) async def webmention(request): source = request.form.get('source') @@ -77,7 +72,7 @@ if __name__ == '__main__': # otherwise it'll become read-only for reasons I'm yet to grasp # the actual parsing will be done at site generation time wdb = shared.WebmentionQueue() - wdb.queue(source,target) + wdb.queue(source, target) # telegram notification, if set shared.notify( @@ -89,5 +84,4 @@ if __name__ == '__main__': response = sanic.response.text("Accepted", status=202) return response - - app.run(host="127.0.0.1",port=8008, log_config=None) + app.run(host="127.0.0.1", port=8008, log_config=None)