From 393cdf64054dd5097707030033d5714c68ebbabd Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 11 Aug 2020 16:09:12 +0100 Subject: [PATCH] Update logging --- currentstateserver/acls/acls.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/currentstateserver/acls/acls.go b/currentstateserver/acls/acls.go index 82776d359..23e236e1f 100644 --- a/currentstateserver/acls/acls.go +++ b/currentstateserver/acls/acls.go @@ -35,7 +35,6 @@ func NewServerACLs(db storage.Database) *ServerACLs { continue } if state != nil { - logrus.Infof("Updating server ACLs for room %q", room) acls.OnServerACLUpdate(&state.Event) } } @@ -75,7 +74,11 @@ func (s *ServerACLs) OnServerACLUpdate(state *gomatrixserverlib.Event) { acls.deniedRegexes = append(acls.deniedRegexes, expr) } } - logrus.Infof("Update server ACLs for %q", state.RoomID()) + logrus.WithFields(logrus.Fields{ + "allow_ip_literals": acls.AllowIPLiterals, + "num_allowed": len(acls.allowedRegexes), + "num_denied": len(acls.deniedRegexes), + }).Infof("Updating server ACLs for %q", state.RoomID()) s.aclsMutex.Lock() defer s.aclsMutex.Unlock() s.acls[state.RoomID()] = acls