MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-25 16:22:35 +01:00
Code Issues Releases Wiki Activity

modules/vm: Fix format of propagated errors.

Browse source
This commit is contained in:
Jason Volk 2018-12-30 16:10:28 -08:00
parent 56474586a1
commit aa7333bd00
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/vm.cc
View file

@ -501,11 +501,12 @@ catch(const error &e) // VM FAULT CODE
return handle_error return handle_error
( (
*eval.opts, e.code, *eval.opts, e.code,
"eval %s %s: %s %s", "eval %s %s: %s %s :%s",
json::get<"event_id"_>(event)?: json::string{"<edu>"}, json::get<"event_id"_>(event)?: json::string{"<edu>"},
reflect(e.code), reflect(e.code),
e.what(), e.what(),
e.content unquote(json::object(e.content).get("errcode")),
unquote(json::object(e.content).get("error"))
); );
} }
catch(const m::error &e) // GENERAL MATRIX ERROR catch(const m::error &e) // GENERAL MATRIX ERROR
@ -513,10 +514,11 @@ catch(const m::error &e) // GENERAL MATRIX ERROR
return handle_error return handle_error
( (
*eval.opts, fault::GENERAL, *eval.opts, fault::GENERAL,
"eval %s #GP (General Protection): %s %s", "eval %s #GP (General Protection): %s %s :%s",
json::get<"event_id"_>(event)?: json::string{"<edu>"}, json::get<"event_id"_>(event)?: json::string{"<edu>"},
e.what(), e.what(),
e.content unquote(json::object(e.content).get("errcode")),
unquote(json::object(e.content).get("error"))
); );
} }
catch(const ctx::interrupted &e) // INTERRUPTION catch(const ctx::interrupted &e) // INTERRUPTION