MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-20 15:38:53 +02:00
Code Issues Releases Wiki Activity

modules/s_fetch: Improve error reporting and reduce warning noise around auth_chain eval.

Browse source
This commit is contained in:
Jason Volk 2019-06-01 18:20:27 -07:00
parent 3108a4bf9b
commit 1dc8f999e7
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/s_fetch.cc
View file

@ -491,6 +491,7 @@ void
IRCD_MODULE_EXPORT
ircd::m::fetch::auth_chain(const room &room,
const net::hostport &remote)
try
{
thread_local char rembuf[64];
log::debug
@ -514,7 +515,7 @@ ircd::m::fetch::auth_chain(const room &room,
room.room_id, room.event_id, buf, std::move(opts)
};
request.wait(seconds(auth_timeout)); //TODO: conf
request.wait(seconds(auth_timeout));
request.get();
const json::array &events
{
@ -534,11 +535,26 @@ ircd::m::fetch::auth_chain(const room &room,
vmopts.infolog_accept = true;
vmopts.fetch_prev_check = false;
vmopts.fetch_state_check = false;
vmopts.warnlog &= ~vm::fault::EXISTS;
m::vm::eval
{
events, vmopts
};
}
catch(const std::exception &e)
{
thread_local char rembuf[64];
log::error
{
log, "Fetching auth chain for %s in %s from %s :%s",
string_view{room.event_id},
string_view{room.room_id},
string(rembuf, remote),
e.what(),
};
throw;
}
bool
IRCD_MODULE_EXPORT