From 861aa01c95e7fe977accb97c55fab094cebd2fbc Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sun, 30 Jun 2024 11:24:34 +0200 Subject: [PATCH] client: don't log warning in State() when StateStore is set State logs a warning that ClearCachedMembers() fails even when nil is returned as error. Looks like this was forgotten in 581aa80 (Fix some error logs, 2024-02-23). --- client.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/client.go b/client.go index 1d6433ac..997d7363 100644 --- a/client.go +++ b/client.go @@ -1411,9 +1411,11 @@ func (cli *Client) State(ctx context.Context, roomID id.RoomID) (stateMap RoomSt }) if err == nil && cli.StateStore != nil { clearErr := cli.StateStore.ClearCachedMembers(ctx, roomID) - cli.cliOrContextLog(ctx).Warn().Err(clearErr). - Stringer("room_id", roomID). - Msg("Failed to clear cached member list after fetching state") + if clearErr != nil { + cli.cliOrContextLog(ctx).Warn().Err(clearErr). + Stringer("room_id", roomID). + Msg("Failed to clear cached member list after fetching state") + } for _, evts := range stateMap { for _, evt := range evts { UpdateStateStore(ctx, cli.StateStore, evt)