xarvos/witchie
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Truncate long log lines unless --verbose given

Browse source
This commit is contained in:
Ivan Habunek 2022-12-27 12:02:23 +01:00
parent adf3f713a6
commit 69b9ab3164
No known key found for this signature in database
GPG key ID: F5F0623FF5EBCB3D
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
toot/logging.py
View file

@ -1,9 +1,12 @@
import json import json
import sys
from logging import getLogger from logging import getLogger
logger = getLogger('toot') logger = getLogger('toot')
VERBOSE = "--verbose" in sys.argv
def censor_secrets(headers): def censor_secrets(headers):
def _censor(k, v): def _censor(k, v):
@ -14,6 +17,13 @@ def censor_secrets(headers):
return {_censor(k, v) for k, v in headers.items()} return {_censor(k, v) for k, v in headers.items()}
def truncate(line):
if not VERBOSE and len(line) > 100:
return line[:100] + "…"
return line
def log_request(request): def log_request(request):
logger.debug(">>> \033[32m{} {}\033[0m".format(request.method, request.url)) logger.debug(">>> \033[32m{} {}\033[0m".format(request.method, request.url))
@ -22,10 +32,12 @@ def log_request(request):
logger.debug(">>> HEADERS: \033[33m{}\033[0m".format(headers)) logger.debug(">>> HEADERS: \033[33m{}\033[0m".format(headers))
if request.data: if request.data:
logger.debug(">>> DATA: \033[33m{}\033[0m".format(request.data)) data = truncate(request.data)
logger.debug(">>> DATA: \033[33m{}\033[0m".format(data))
if request.json: if request.json:
logger.debug(">>> JSON: \033[33m{}\033[0m".format(json.dumps(request.json))) data = truncate(json.dumps(request.json))
logger.debug(">>> JSON: \033[33m{}\033[0m".format(data))
if request.files: if request.files:
logger.debug(">>> FILES: \033[33m{}\033[0m".format(request.files)) logger.debug(">>> FILES: \033[33m{}\033[0m".format(request.files))
@ -35,12 +47,14 @@ def log_request(request):
def log_response(response): def log_response(response):
content = truncate(response.content.decode())
if response.ok: if response.ok:
logger.debug("<<< \033[32m{}\033[0m".format(response)) logger.debug("<<< \033[32m{}\033[0m".format(response))
logger.debug("<<< \033[33m{}\033[0m".format(response.content.decode())) logger.debug("<<< \033[33m{}\033[0m".format(content))
else: else:
logger.debug("<<< \033[31m{}\033[0m".format(response)) logger.debug("<<< \033[31m{}\033[0m".format(response))
logger.debug("<<< \033[31m{}\033[0m".format(response.content.decode())) logger.debug("<<< \033[31m{}\033[0m".format(content))
def log_debug(*msgs): def log_debug(*msgs):