0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-16 23:10:54 +01:00

modules/console: Improve feds state output.

This commit is contained in:
Jason Volk 2018-05-05 16:49:17 -07:00
parent 2ed18d38c2
commit c98481c334

View file

@ -3597,19 +3597,14 @@ console_cmd__feds__state(opt &out, const string_view &line)
"federation_federation", "feds__state" "federation_federation", "feds__state"
}; };
feds__state(room_id, event_id, out.timeout, [&out] std::forward_list<std::string> origins;
std::map<std::string, std::forward_list<string_view>, std::less<>> grid;
feds__state(room_id, event_id, out.timeout, [&out, &grid, &origins]
(const string_view &origin, std::exception_ptr eptr, const json::object &response) (const string_view &origin, std::exception_ptr eptr, const json::object &response)
{ {
out << (eptr? '-' : '+')
<< " "
<< std::setw(40) << std::left << origin
<< " ";
if(eptr) if(eptr)
{
out << what(eptr) << std::endl;
return true; return true;
}
const json::array &auth_chain const json::array &auth_chain
{ {
@ -3621,14 +3616,35 @@ console_cmd__feds__state(opt &out, const string_view &line)
response["pdu_ids"] response["pdu_ids"]
}; };
out << size(pdus) for(const auto &pdu_id : pdus)
<< " " {
<< size(auth_chain) const auto &event_id{unquote(pdu_id)};
<< std::endl; auto it
{
grid.lower_bound(event_id)
};
if(it == end(grid) || it->first != event_id)
it = grid.emplace_hint(it, event_id, std::forward_list<string_view>{});
origins.emplace_front(origin);
it->second.emplace_front(origins.front());
}
return true; return true;
}); });
for(auto &p : grid)
{
p.second.sort();
out << std::setw(64) << std::left << p.first << " : ";
for(const auto &origin : p.second)
out << " " << origin;
out << std::endl;
}
return true; return true;
} }