MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-10-02 13:48:53 +02:00
Code Issues Releases Wiki Activity

modules/client/rooms/join: Exception handling around bootstrap eval.

Browse source
This commit is contained in:
Jason Volk 2019-07-15 16:34:02 -07:00
parent 8c7623ff99
commit 449f667dd9
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/client/rooms/join.cc
View file

@ -453,7 +453,7 @@ catch(const std::exception &e)
{ {
log::error log::error
{ {
join_log, "Bootstrap %s backfill @ %s from %s :%s", join_log, "join bootstrap %s backfill @ %s from %s :%s",
string_view{room_id}, string_view{room_id},
string_view{event_id}, string_view{event_id},
string(host), string(host),
@ -463,6 +463,7 @@ catch(const std::exception &e)
void void
bootstrap_eval_state(const json::array &state) bootstrap_eval_state(const json::array &state)
try
{ {
m::vm::opts opts; m::vm::opts opts;
opts.nothrows = -1; opts.nothrows = -1;
@ -474,9 +475,17 @@ bootstrap_eval_state(const json::array &state)
state, opts state, opts
}; };
} }
catch(const std::exception &e)
{
log::error
{
join_log, "join bootstrap eval state :%s", e.what(),
};
}
void void
bootstrap_eval_auth_chain(const json::array &auth_chain) bootstrap_eval_auth_chain(const json::array &auth_chain)
try
{ {
m::vm::opts opts; m::vm::opts opts;
opts.infolog_accept = true; opts.infolog_accept = true;
@ -486,6 +495,15 @@ bootstrap_eval_auth_chain(const json::array &auth_chain)
auth_chain, opts auth_chain, opts
}; };
} }
catch(const std::exception &e)
{
log::error
{
join_log, "join bootstrap eval auth_chain :%s", e.what(),
};
throw;
}
void void
bootstrap_eval_lazy_chain(const json::array &auth_chain) bootstrap_eval_lazy_chain(const json::array &auth_chain)