Update logging

This commit is contained in:
Neil Alexander 2020-08-11 16:09:12 +01:00
parent 13426dbccd
commit 393cdf6405
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944

View file

@ -35,7 +35,6 @@ func NewServerACLs(db storage.Database) *ServerACLs {
continue continue
} }
if state != nil { if state != nil {
logrus.Infof("Updating server ACLs for room %q", room)
acls.OnServerACLUpdate(&state.Event) acls.OnServerACLUpdate(&state.Event)
} }
} }
@ -75,7 +74,11 @@ func (s *ServerACLs) OnServerACLUpdate(state *gomatrixserverlib.Event) {
acls.deniedRegexes = append(acls.deniedRegexes, expr) 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() s.aclsMutex.Lock()
defer s.aclsMutex.Unlock() defer s.aclsMutex.Unlock()
s.acls[state.RoomID()] = acls s.acls[state.RoomID()] = acls