MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-25 15:04:10 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Wrap all queries into ircd::server through fed suite.

Browse source
This commit is contained in:
Jason Volk 2020-04-25 19:52:24 -07:00
parent 267e978247
commit 37335a68d7
8 changed files with 44 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
matrix/burst.cc
View file

@ -39,6 +39,8 @@ try
string_view{node.node_id},
};
fed::clear_error(node.node_id);
if(opts.cache_warming)
if(ircd::uptime() < seconds(cache_warmup_time))
cache_warming(node, opts);

4
matrix/feds.cc
View file

@ -449,7 +449,7 @@ ircd::m::feds::for_each_in_room(const opts &opts,
const auto errant
{
server::errant(fed::matrix_service(origin))
fed::errant(origin)
};
if(opts.closure_cached_errors || !errant) try
@ -490,7 +490,7 @@ ircd::m::feds::for_one(const string_view &origin,
const auto errant
{
server::errant(fed::matrix_service(origin))
fed::errant(origin)
};
if(opts.closure_cached_errors || !errant) try

2
matrix/fetch.cc
View file

@ -580,7 +580,7 @@ ircd::m::fetch::select_random_origin(request &request)
return false;
// Don't want to use a peer marked with an error by ircd::server
if(ircd::server::errant(fed::matrix_service(origin)))
if(fed::errant(origin))
return false;
return true;

2
matrix/resource.cc
View file

@ -72,7 +72,7 @@ try
// If we have an error cached from previously not being able to
// contact this origin we can clear that now that they're alive.
if(request.node_id && server::errclear(fed::matrix_service(request.node_id)))
if(request.node_id && fed::errant(request.node_id))
{
m::burst::opts opts;
m::burst::burst

6
matrix/room_origins.cc
View file

@ -117,7 +117,7 @@ const
size_t ret{0};
for_each([&ret](const string_view &server)
{
ret += server::errant(fed::matrix_service(server));
ret += fed::errant(server);
});
return ret;
@ -132,9 +132,9 @@ const
0 - ssize_t(count_error())
};
for_each([&ret](const string_view &hostport)
for_each([&ret](const string_view &server)
{
ret += bool(server::exists(fed::matrix_service(hostport)));
ret += bool(fed::exists(server));
});
assert(ret >= 0L);

38
modules/console.cc
View file

@ -5018,9 +5018,17 @@ console_cmd__peer(opt &out, const string_view &line)
const bool conn(has(line, "conn"));
if(hostport && !all && !active && !conn)
{
char buf[rfc3986::DOMAIN_BUFSIZE];
const auto remote
{
net::service(net::hostport(hostport)) == "matrix"?
m::fed::server(buf, hostport):
m::fed::matrix_service(hostport)
};
auto &peer
{
server::find(m::fed::matrix_service(hostport))
server::find(remote)
};
print_head();
@ -5141,14 +5149,22 @@ console_cmd__peer__error__clear(opt &out, const string_view &line)
if(empty(line))
return console_cmd__peer__error__clear__all(out, line);
const net::hostport hp
const string_view &input
{
token(line, ' ', 0)
};
char buf[rfc3986::DOMAIN_BUFSIZE];
const net::hostport remote
{
service(net::hostport(input)) == "matrix"?
m::fed::server(buf, input):
m::fed::matrix_service(input)
};
const auto cleared
{
server::errclear(m::fed::matrix_service(hp))
server::errclear(remote)
};
out << std::boolalpha << cleared << std::endl;
@ -5230,14 +5246,22 @@ try
"hostport"
}};
const auto &hostport
const auto &hp
{
param.at(0)
param["hostport"]
};
char buf[rfc3986::DOMAIN_BUFSIZE];
const net::hostport remote
{
service(net::hostport(hp)) == "matrix"?
m::fed::server(buf, hp):
m::fed::matrix_service(hp)
};
auto &peer
{
server::find(hostport)
server::find(remote)
};
peer.cancel();
@ -9474,7 +9498,7 @@ console_cmd__room__origins__random(opt &out, const string_view &line)
const auto ok{[&noerror]
(const string_view &origin)
{
if(noerror && server::errant(m::fed::matrix_service(origin)))
if(noerror && m::fed::errant(origin))
return false;
return true;

2
modules/federation/query.cc
View file

@ -199,7 +199,7 @@ get__query_directory(client &client,
if(my_host(origin))
return true;
if(server::avail(m::fed::matrix_service(origin)))
if(m::fed::avail(origin))
return true;
servers.append(origin);

21
modules/federation/sender.cc
View file

@ -277,12 +277,7 @@ send_to_room(const m::event &event,
if(my_host(origin))
return;
const auto remote
{
m::fed::matrix_service(origin)
};
if(server::errant(remote))
if(m::fed::errant(origin))
return;
auto it
@ -341,12 +336,7 @@ send_to_user(const m::event &event,
if(my_host(origin))
return;
const auto remote
{
m::fed::matrix_service(origin)
};
if(server::errant(remote))
if(m::fed::errant(origin))
return;
auto it
@ -389,12 +379,7 @@ send_from_user(const m::event &event,
if(my_host(origin))
return true;
const auto remote
{
m::fed::matrix_service(origin)
};
if(server::errant(remote))
if(m::fed::errant(origin))
return true;
auto it