| |
@@ -6,8 +6,6 @@
|
| |
|
| |
import json
|
| |
import logging
|
| |
- from logging import getLogger
|
| |
- from logging import FileHandler
|
| |
|
| |
from flask import Flask, request, Response
|
| |
import os
|
| |
@@ -21,27 +19,36 @@
|
| |
|
| |
|
| |
# setup logger
|
| |
+ class RemoteAddrFilter(logging.Filter):
|
| |
+ """
|
| |
+ Define `%(remote_addr)s` key for the formatter string
|
| |
+ """
|
| |
+
|
| |
+ def filter(self, record):
|
| |
+ record.remote_addr = request.remote_addr if request else "SERVER"
|
| |
+ return True
|
| |
+
|
| |
+
|
| |
if not app.config["DEBUG"] or app.config["DEBUG_WITH_LOG"]:
|
| |
filename = os.path.join(app.config["LOG_DIR"], "main.log")
|
| |
if os.path.exists(app.config["LOG_DIR"]):
|
| |
- handler = FileHandler(filename)
|
| |
+ handler = logging.FileHandler(filename)
|
| |
handler.setLevel(app.config["LOG_LEVEL"])
|
| |
handler.setFormatter(logging.Formatter(
|
| |
'%(asctime)s %(levelname)s'
|
| |
- '[%(module)s:%(pathname)s:%(lineno)d]'
|
| |
+ '[%(module)s:%(pathname)s:%(lineno)d][%(remote_addr)s]'
|
| |
': %(message)s '
|
| |
))
|
| |
- logger = getLogger(__name__)
|
| |
- logger.addHandler(handler)
|
| |
- logger.setLevel(app.config["LOG_LEVEL"])
|
| |
+ handler.addFilter(RemoteAddrFilter())
|
| |
+ app.logger.addHandler(handler)
|
| |
|
| |
+ app.logger.setLevel(app.config["LOG_LEVEL"])
|
| |
+ app.logger.addFilter(RemoteAddrFilter())
|
| |
# end setup logger
|
| |
|
| |
|
| |
from .logic import create_new_key, user_exists, get_passphrase_location
|
| |
|
| |
- log = logging.getLogger(__name__)
|
| |
-
|
| |
|
| |
@app.route('/ping')
|
| |
def ping():
|
| |
@@ -50,7 +57,7 @@
|
| |
|
| |
:status 200: server alive
|
| |
"""
|
| |
- log.debug("got ping")
|
| |
+ app.logger.debug("got ping")
|
| |
return Response("pong\n", content_type="text/plain;charset=UTF-8")
|
| |
|
| |
|
| |
@@ -91,7 +98,7 @@
|
| |
except Exception as e:
|
| |
raise BadRequestException("Failed to parse request body: {}".format(e))
|
| |
|
| |
- log.info("received gen_key query: {}".format(query))
|
| |
+ app.logger.info("received gen_key query: {}".format(query))
|
| |
if "name_real" not in query:
|
| |
raise BadRequestException("Request query missing required "
|
| |
"parameter `name_real`".format(query))
|
| |
@@ -123,12 +130,6 @@
|
| |
|
| |
|
| |
@app.errorhandler(500)
|
| |
- def handle_invalid_usage(error):
|
| |
- response = Response(error.msg, content_type="text/plain;charset=UTF-8")
|
| |
- response.status_code = error.status_code
|
| |
- response.data = str(error)
|
| |
- return response
|
| |
-
|
| |
@app.errorhandler(KeygenServiceBaseException)
|
| |
def handle_invalid_usage(error):
|
| |
response = Response(error.msg, content_type="text/plain;charset=UTF-8")
|
| |
Please see commit descriptions.