MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-10 14:08:56 +02:00
Code Issues Releases Wiki Activity

modules/s_fetch: Improve error handling on submit()/start(request).

Browse source
This commit is contained in:
Jason Volk 2019-04-12 05:29:12 -07:00
parent d7cc387688
commit e90d016d2e
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/s_fetch.cc
View file

@ -768,18 +768,19 @@ catch(const std::exception &e)
// fetch::request
//
void
bool
ircd::m::fetch::start(request &request)
{
m::v1::event::opts opts;
opts.dynamic = true;
opts.remote = request.origin?: select_random_origin(request);
start(request, opts);
return start(request, opts);
}
void
bool
ircd::m::fetch::start(request &request,
m::v1::event::opts &opts)
try
{
assert(request.finished == 0);
if(!request.started)
@ -800,6 +801,21 @@ ircd::m::fetch::start(request &request,
};
dock.notify_all();
return true;
}
catch(const std::exception &e)
{
log::error
{
log, "Failed to start request for %s in %s to '%s' :%s",
string_view{request.event_id},
string_view{request.room_id},
string_view{request.origin},
e.what()
};
request.origin = {};
return false;
}
ircd::string_view
@ -836,7 +852,7 @@ ircd::m::fetch::select_random_origin(request &request)
return true;
}};
if(!origins.random(closure, proffer))
if(!origins.random(closure, proffer) || !request.origin)
throw m::NOT_FOUND
{
"Cannot find any server to fetch %s in %s",

8
modules/s_fetch.h
View file

@ -30,8 +30,8 @@ namespace ircd::m::fetch
static string_view select_random_origin(request &);
static void finish(request &);
static void retry(request &);
static void start(request &, m::v1::event::opts &);
static void start(request &);
static bool start(request &, m::v1::event::opts &);
static bool start(request &);
static bool handle(request &);
template<class... args> static void submit(const event::id &, const room::id &, const size_t &bufsz = 8_KiB, args&&...);
@ -62,13 +62,13 @@ ircd::m::fetch::submit(const m::event::id &event_id,
if(it == end(requests) || it->event_id != event_id) try
{
it = requests.emplace_hint(it, room_id, event_id, bufsz, std::forward<args>(a)...);
start(const_cast<request &>(*it));
while(!start(const_cast<request &>(*it)));
}
catch(const std::exception &e)
{
log::error
{
m::log, "Failed to start fetch for %s in %s :%s",
m::log, "Failed to start any fetch for %s in %s :%s",
string_view{event_id},
string_view{room_id},
e.what(),