MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-18 07:50:57 +01:00
Code Issues Releases Wiki Activity

modules/client/sync: Ignore errs for graceful degradation w/o killing entire polylog sync.

Browse source
This commit is contained in:
Jason Volk 2018-05-17 19:32:26 -07:00
parent 631020d932
commit 47e5e94ac1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/client/sync.cc
View file

@ -627,7 +627,7 @@ catch(const std::exception &e)
{ {
log::error log::error
{ {
"polylog sync ERROR %lu to %lu (vm @ %zu) :%s" "polylog sync FAILED %lu to %lu (vm @ %zu) :%s"
,sp.since ,sp.since
,sp.current ,sp.current
,m::vm::current_sequence ,m::vm::current_sequence
@ -652,7 +652,7 @@ polylog_sync_presence(shortpoll &sp,
(const m::user &user) (const m::user &user)
{ {
const m::user::room user_room{user}; const m::user::room user_room{user};
if(head_idx(user_room) <= sp.since) if(head_idx(std::nothrow, user_room) <= sp.since)
return; return;
//TODO: can't check event_idx cuz only closed presence content //TODO: can't check event_idx cuz only closed presence content
@ -704,7 +704,7 @@ polylog_sync_account_data(shortpoll &sp,
{ {
const auto &event_idx const auto &event_idx
{ {
index(event) index(event, std::nothrow)
}; };
if(event_idx < sp.since || event_idx >= sp.current) if(event_idx < sp.since || event_idx >= sp.current)
@ -772,7 +772,7 @@ polylog_sync_rooms__membership(shortpoll &sp,
sp.rooms.for_each(membership, [&] sp.rooms.for_each(membership, [&]
(const m::room &room, const string_view &) (const m::room &room, const string_view &)
{ {
if(head_idx(room) <= sp.since) if(head_idx(std::nothrow, room) <= sp.since)
return; return;
const m::room::id &room_id{room.room_id}; const m::room::id &room_id{room.room_id};
@ -882,7 +882,7 @@ polylog_sync_room_state(shortpoll &sp,
const auto &event_idx const auto &event_idx
{ {
index(event) index(event, std::nothrow)
}; };
if(event_idx < sp.since || event_idx >= sp.current) if(event_idx < sp.since || event_idx >= sp.current)
@ -1001,7 +1001,7 @@ polylog_sync_room_ephemeral_events(shortpoll &sp,
(const m::user &user) (const m::user &user)
{ {
const m::user::room user_room{user}; const m::user::room user_room{user};
if(head_idx(user_room) <= sp.since) if(head_idx(std::nothrow, user_room) <= sp.since)
return; return;
user_room.get(std::nothrow, "ircd.read", room.room_id, [&] user_room.get(std::nothrow, "ircd.read", room.room_id, [&]
@ -1009,7 +1009,7 @@ polylog_sync_room_ephemeral_events(shortpoll &sp,
{ {
const auto &event_idx const auto &event_idx
{ {
index(event) index(event, std::nothrow)
}; };
if(event_idx < sp.since || event_idx >= sp.current) if(event_idx < sp.since || event_idx >= sp.current)