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

--verbose and --no-color options now work with --debug logging

Browse source
This commit is contained in:
Daniel Schwarz 2023-01-18 20:15:37 -05:00 committed by Ivan Habunek
parent f3b90c947e
commit 459937f196
2 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
toot/console.py
View file

@ -116,6 +116,11 @@ common_args = [
"action": 'store_true', "action": 'store_true',
"default": False, "default": False,
}), }),
(["--verbose"], {
"help": "show extra detail in debug log; used with --debug",
"action": 'store_true',
"default": False,
}),
] ]
# Arguments added to commands which require authentication # Arguments added to commands which require authentication

34
toot/logging.py
View file

@ -6,6 +6,18 @@ from logging import getLogger
logger = getLogger('toot') logger = getLogger('toot')
VERBOSE = "--verbose" in sys.argv VERBOSE = "--verbose" in sys.argv
COLOR = "--no-color" not in sys.argv
if COLOR:
ANSI_RED = "\033[31m"
ANSI_GREEN = "\033[32m"
ANSI_YELLOW = "\033[33m"
ANSI_END_COLOR = "\033[0m"
else:
ANSI_RED = ""
ANSI_GREEN = ""
ANSI_YELLOW = ""
ANSI_END_COLOR = ""
def censor_secrets(headers): def censor_secrets(headers):
@ -25,36 +37,38 @@ def truncate(line):
def log_request(request): def log_request(request):
logger.debug(">>> \033[32m{} {}\033[0m".format(request.method, request.url))
logger.debug(f">>> {ANSI_GREEN}{request.method} {request.url}{ANSI_END_COLOR}")
if request.headers: if request.headers:
headers = censor_secrets(request.headers) headers = censor_secrets(request.headers)
logger.debug(">>> HEADERS: \033[33m{}\033[0m".format(headers)) logger.debug(f">>> HEADERS: {ANSI_GREEN}{headers}{ANSI_END_COLOR}")
if request.data: if request.data:
data = truncate(request.data) data = truncate(request.data)
logger.debug(">>> DATA: \033[33m{}\033[0m".format(data)) logger.debug(f">>> DATA: {ANSI_GREEN}{data}{ANSI_END_COLOR}")
if request.json: if request.json:
data = truncate(json.dumps(request.json)) data = truncate(json.dumps(request.json))
logger.debug(">>> JSON: \033[33m{}\033[0m".format(data)) logger.debug(f">>> JSON: {ANSI_GREEN}{data}{ANSI_END_COLOR}")
if request.files: if request.files:
logger.debug(">>> FILES: \033[33m{}\033[0m".format(request.files)) logger.debug(f">>> FILES: {ANSI_GREEN}{request.files}{ANSI_END_COLOR}")
if request.params: if request.params:
logger.debug(">>> PARAMS: \033[33m{}\033[0m".format(request.params)) logger.debug(f">>> PARAMS: {ANSI_GREEN}{request.params}{ANSI_END_COLOR}")
def log_response(response): def log_response(response):
content = truncate(response.content.decode()) content = truncate(response.content.decode())
if response.ok: if response.ok:
logger.debug("<<< \033[32m{}\033[0m".format(response)) logger.debug(f"<<< {ANSI_GREEN}{response}{ANSI_END_COLOR}")
logger.debug("<<< \033[33m{}\033[0m".format(content)) logger.debug(f"<<< {ANSI_YELLOW}{content}{ANSI_END_COLOR}")
else: else:
logger.debug("<<< \033[31m{}\033[0m".format(response)) logger.debug(f"<<< {ANSI_RED}{response}{ANSI_END_COLOR}")
logger.debug("<<< \033[31m{}\033[0m".format(content)) logger.debug(f"<<< {ANSI_RED}{content}{ANSI_END_COLOR}")
def log_debug(*msgs): def log_debug(*msgs):