component AP gateway: better verbose logging:
gather data to show according to verbosity and log it all at once with a small `<<<` or `>>>` indicating the direction. With a verbosity of 3, headers are also shown.
This commit is contained in:
parent
c437424053
commit
eb797103e6
2 changed files with 30 additions and 25 deletions
|
|
@ -1166,9 +1166,10 @@ class APGateway:
|
||||||
if self.verbose:
|
if self.verbose:
|
||||||
__, actor_args = self.parseAPURL(actor_id)
|
__, actor_args = self.parseAPURL(actor_id)
|
||||||
actor_account = actor_args[0]
|
actor_account = actor_args[0]
|
||||||
log.info(
|
to_log = [
|
||||||
f"==> {actor_account} is signing and posting to {url}:\n{pformat(doc)}"
|
"",
|
||||||
)
|
f">>> {actor_account} is signing and posting to {url}:\n{pformat(doc)}"
|
||||||
|
]
|
||||||
|
|
||||||
p_url = parse.urlparse(url)
|
p_url = parse.urlparse(url)
|
||||||
body = json.dumps(doc).encode()
|
body = json.dumps(doc).encode()
|
||||||
|
|
@ -1183,9 +1184,13 @@ class APGateway:
|
||||||
}
|
}
|
||||||
headers, __ = self.getSignatureData(self.getKeyId(actor_id), headers)
|
headers, __ = self.getSignatureData(self.getKeyId(actor_id), headers)
|
||||||
|
|
||||||
headers["Content-Type"] = (
|
if self.verbose:
|
||||||
'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
|
if self.verbose>=3:
|
||||||
)
|
h_to_log = "\n".join(f" {k}: {v}" for k,v in headers.items())
|
||||||
|
to_log.append(f" headers:\n{h_to_log}")
|
||||||
|
to_log.append("---")
|
||||||
|
log.info("\n".join(to_log))
|
||||||
|
|
||||||
resp = await treq.post(
|
resp = await treq.post(
|
||||||
url,
|
url,
|
||||||
body,
|
body,
|
||||||
|
|
|
||||||
|
|
@ -821,18 +821,25 @@ class HTTPAPGServer(web_resource.Resource):
|
||||||
signing_actor: Optional[str] = None
|
signing_actor: Optional[str] = None
|
||||||
) -> None:
|
) -> None:
|
||||||
if self.apg.verbose:
|
if self.apg.verbose:
|
||||||
|
from pprint import pformat
|
||||||
|
to_log = [
|
||||||
|
"",
|
||||||
|
f"<<< got {request.method.decode()} request - {request.uri.decode()}"
|
||||||
|
]
|
||||||
try:
|
try:
|
||||||
data = json.load(request.content)
|
data = json.load(request.content)
|
||||||
except (json.JSONDecodeError, ValueError) as e:
|
except (json.JSONDecodeError, ValueError):
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
from pprint import pformat
|
to_log.append(pformat(data))
|
||||||
log.info(
|
|
||||||
f"==> got {request.method.decode()} request:\n{pformat(data)}\n---"
|
|
||||||
)
|
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
request.content.seek(0)
|
request.content.seek(0)
|
||||||
|
if self.apg.verbose>=3:
|
||||||
|
headers = "\n".join(
|
||||||
|
f" {k.decode()}: {v.decode()}"
|
||||||
|
for k,v in request.getAllHeaders().items()
|
||||||
|
)
|
||||||
|
to_log.append(f" headers:\n{headers}")
|
||||||
|
|
||||||
path = request.path.decode()
|
path = request.path.decode()
|
||||||
ap_url = parse.urljoin(
|
ap_url = parse.urljoin(
|
||||||
|
|
@ -871,20 +878,13 @@ class HTTPAPGServer(web_resource.Resource):
|
||||||
if ret_data is not None:
|
if ret_data is not None:
|
||||||
request.setHeader("content-type", CONTENT_TYPE_AP)
|
request.setHeader("content-type", CONTENT_TYPE_AP)
|
||||||
request.write(json.dumps(ret_data).encode())
|
request.write(json.dumps(ret_data).encode())
|
||||||
|
if self.apg.verbose:
|
||||||
|
to_log.append(f"--- RET (code: {request.code})---")
|
||||||
if self.apg.verbose>=2:
|
if self.apg.verbose>=2:
|
||||||
from pprint import pformat
|
if ret_data is not None:
|
||||||
to_log = [f"==> ret (code: {request.code}):\n{pformat(ret_data)}"]
|
to_log.append(f"{pformat(ret_data)}")
|
||||||
log.info(
|
to_log.append("---")
|
||||||
|
log.info("\n".join(to_log))
|
||||||
)
|
|
||||||
if self.apg.verbose>=3:
|
|
||||||
headers = "\n".join(
|
|
||||||
f" {k.decode()}: {v.decode()}"
|
|
||||||
for k,v in request.getAllHeaders().items()
|
|
||||||
)
|
|
||||||
to_log.append(" headers:\n{headers}")
|
|
||||||
to_log.append("---")
|
|
||||||
log.info("\n".join(to_log))
|
|
||||||
request.finish()
|
request.finish()
|
||||||
|
|
||||||
async def APPostRequest(self, request: "HTTPRequest"):
|
async def APPostRequest(self, request: "HTTPRequest"):
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue