mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-20 12:33:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove debug logs

Browse source
This commit is contained in:
Till Faelligen 2022-11-03 15:05:25 +01:00
parent 49f4d4f6c9
commit 2cc70193df
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
3 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clientapi/routing/presence.go
View file

@ -103,10 +103,11 @@ func GetPresence(
JSON: jsonerror.InternalServerError(), JSON: jsonerror.InternalServerError(),
} }
} }
log.Debugf("XXX: 1")
statusMsg := presence.Header.Get("status_msg") statusMsg := presence.Header.Get("status_msg")
e := presence.Header.Get("error") e := presence.Header.Get("error")
if e != "" { if e != "" {
log.Errorf("received error msg from nats: %s", e)
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusOK, Code: http.StatusOK,
JSON: types.PresenceClientResponse{ JSON: types.PresenceClientResponse{
@ -114,17 +115,14 @@ func GetPresence(
}, },
} }
} }
log.Debugf("XXX: 2")
lastActive, err := strconv.Atoi(presence.Header.Get("last_active_ts")) lastActive, err := strconv.Atoi(presence.Header.Get("last_active_ts"))
if err != nil { if err != nil {
log.WithError(err).Errorf("WTF?!")
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusInternalServerError, Code: http.StatusInternalServerError,
JSON: jsonerror.InternalServerError(), JSON: jsonerror.InternalServerError(),
} }
} }
log.Debugf("XXX: 3")
p := types.PresenceInternal{LastActiveTS: gomatrixserverlib.Timestamp(lastActive)} p := types.PresenceInternal{LastActiveTS: gomatrixserverlib.Timestamp(lastActive)}
currentlyActive := p.CurrentlyActive() currentlyActive := p.CurrentlyActive()
return util.JSONResponse{ return util.JSONResponse{

4
syncapi/storage/sqlite3/presence_table.go
View file

@ -20,8 +20,6 @@ import (
"strings" "strings"
"time" "time"
"github.com/sirupsen/logrus"
"github.com/matrix-org/dendrite/internal" "github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/dendrite/syncapi/types" "github.com/matrix-org/dendrite/syncapi/types"
@ -148,7 +146,7 @@ func (p *presenceStatements) GetPresenceForUsers(
return nil, err return nil, err
} }
defer internal.CloseAndLogIfError(ctx, prepStmt, "GetPresenceForUsers: stmt.close() failed") defer internal.CloseAndLogIfError(ctx, prepStmt, "GetPresenceForUsers: stmt.close() failed")
logrus.Debugf("XXX: getting users: %v", userIDs)
params := make([]interface{}, len(userIDs)) params := make([]interface{}, len(userIDs))
for i := range userIDs { for i := range userIDs {
params[i] = userIDs[i] params[i] = userIDs[i]

30
syncapi/streams/stream_presence.go
View file

@ -161,21 +161,23 @@ func (p *PresenceStreamProvider) getNeededUsersFromRequest(ctx context.Context,
// add newly joined rooms user presences // add newly joined rooms user presences
newlyJoined := joinedRooms(req.Response, req.Device.UserID) newlyJoined := joinedRooms(req.Response, req.Device.UserID)
if len(newlyJoined) > 0 { if len(newlyJoined) == 0 {
// TODO: Check if this is working better than before. return getPresenceForUsers, nil
if err := p.notifier.LoadRooms(ctx, p.DB, newlyJoined); err != nil { }
req.Log.WithError(err).Error("unable to refresh notifier lists")
return getPresenceForUsers, err // TODO: Check if this is working better than before.
} if err := p.notifier.LoadRooms(ctx, p.DB, newlyJoined); err != nil {
for _, roomID := range newlyJoined { req.Log.WithError(err).Error("unable to refresh notifier lists")
roomUsers := p.notifier.JoinedUsers(roomID) return getPresenceForUsers, err
for i := range roomUsers { }
// we already got a presence from this user for _, roomID := range newlyJoined {
if _, ok := presences[roomUsers[i]]; ok { roomUsers := p.notifier.JoinedUsers(roomID)
continue for i := range roomUsers {
} // we already got a presence from this user
getPresenceForUsers = append(getPresenceForUsers, roomUsers[i]) if _, ok := presences[roomUsers[i]]; ok {
continue
} }
getPresenceForUsers = append(getPresenceForUsers, roomUsers[i])
} }
} }
return getPresenceForUsers, nil return getPresenceForUsers, nil