From c0845ea1adc1784c6d70574adb073c876bf9704f Mon Sep 17 00:00:00 2001
From: Till Faelligen <tfaelligen@gmail.com>
Date: Mon, 21 Feb 2022 14:44:16 +0100
Subject: [PATCH] Update logging

---
 clientapi/routing/consent_tracking.go | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/clientapi/routing/consent_tracking.go b/clientapi/routing/consent_tracking.go
index ca33da08c..1ed7fd16c 100644
--- a/clientapi/routing/consent_tracking.go
+++ b/clientapi/routing/consent_tracking.go
@@ -117,7 +117,6 @@ func sendServerNoticeForConsent(userAPI userapi.UserInternalAPI, rsAPI api.Rooms
 	accountsDB userdb.Database,
 	asAPI appserviceAPI.AppServiceQueryAPI,
 ) {
-	logrus.Infof("Sending server notice to users who have not yet accepted the policy")
 	res := &userapi.QueryOutdatedPolicyUsersResponse{}
 	if err := userAPI.GetOutdatedPolicy(context.Background(), &userapi.QueryOutdatedPolicyUsersRequest{
 		PolicyVersion: cfgClient.Matrix.UserConsentOptions.Version,
@@ -126,10 +125,17 @@ func sendServerNoticeForConsent(userAPI userapi.UserInternalAPI, rsAPI api.Rooms
 		return
 	}
 
-	consentOpts := cfgClient.Matrix.UserConsentOptions
-	data := make(map[string]string)
-	var err error
-	sentMessages := 0
+	var (
+		consentOpts  = cfgClient.Matrix.UserConsentOptions
+		data         = make(map[string]string)
+		err          error
+		sentMessages int
+	)
+
+	if len(res.OutdatedUsers) > 0 {
+		logrus.WithField("count", len(res.OutdatedUsers)).Infof("Sending server notice to users who have not yet accepted the policy")
+	}
+
 	for _, userID := range res.OutdatedUsers {
 		if userID == cfgClient.Matrix.ServerNotices.LocalPart {
 			continue
@@ -140,7 +146,6 @@ func sendServerNoticeForConsent(userAPI userapi.UserInternalAPI, rsAPI api.Rooms
 			logrus.WithError(err).WithField("userID", userID).Error("unable to construct consentURI")
 			continue
 		}
-		logrus.Debugf("sending message to %s", userID)
 		msgBody := &bytes.Buffer{}
 
 		if err = consentOpts.TextTemplates.ExecuteTemplate(msgBody, "serverNoticeTemplate", data); err != nil {
@@ -174,7 +179,9 @@ func sendServerNoticeForConsent(userAPI userapi.UserInternalAPI, rsAPI api.Rooms
 			continue
 		}
 	}
-	logrus.Infof("Send messages to %d users", sentMessages)
+	if sentMessages > 0 {
+		logrus.Infof("Sent messages to %d users", sentMessages)
+	}
 }
 
 func buildConsentURI(cfgClient *config.ClientAPI, userID string) (string, error) {