From 0f2f2e2f1cd9cbdc02aa5cfa95e8885b4c5df77a Mon Sep 17 00:00:00 2001 From: Hans Svensson Date: Wed, 3 Jun 2020 18:45:13 +0200 Subject: [PATCH 1/2] Resolve all readers in ExtendedStar --- apps/roster/src/roster.erl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/roster/src/roster.erl b/apps/roster/src/roster.erl index b40dafc87..ae51814c5 100644 --- a/apps/roster/src/roster.erl +++ b/apps/roster/src/roster.erl @@ -1553,12 +1553,12 @@ star(#'Roster'{id = RosterId, phone = Phone} = Roster, {error, _} -> {#'Room'{name = <<"Deleted Room">>, id = RoomId}, 0, []} end, - Room#'Room'{unread = Unread, last_msg = LastMsg, members = [ - case muc_member(MsgFrom, RoomId) of - [] -> #'Member'{alias = <<"Deleted Account">>}; - #'Member'{reader = ReaderID} = Member -> - Member#'Member'{reader = roster:reader_cache(ReaderID)} - end]}; + roster:reader_cache( + Room#'Room'{unread = Unread, last_msg = LastMsg, members = [ + case muc_member(MsgFrom, RoomId) of + [] -> #'Member'{alias = <<"Deleted Account">>}; + #'Member'{} = Member -> Member + end]}); _ -> %% get From in requested roster contacts case user(Roster, MsgFrom, Writer, LastSync) of -- GitLab From b1da4cd9c8921eab4926258a5dee584ca498609e Mon Sep 17 00:00:00 2001 From: Tobias Lindahl Date: Thu, 4 Jun 2020 08:31:53 +0200 Subject: [PATCH 2/2] Write errors to error.log.* to avoid log name clash in daemon mode --- sys.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys.config b/sys.config index c319338ae..11a0aa3f9 100644 --- a/sys.config +++ b/sys.config @@ -5,7 +5,7 @@ {logger, [ {handler, default, logger_disk_log_h, #{level => error, - config => #{ file => "log/erlang.log" + config => #{ file => "log/error.log" , type => wrap , max_no_files => 200 , max_no_bytes => 10000000 -- GitLab