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

Remove old logging lines

Browse source
This commit is contained in:
Neil Alexander 2020-03-31 15:04:23 +01:00
parent f77eab285b
commit a4d0278ff5
2 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clientapi/routing/joinroom.go
View file

@ -311,7 +311,6 @@ func (r joinRoomReq) joinRoomUsingServer(roomID string, server gomatrixserverlib
var request api.QueryRoomVersionCapabilitiesRequest var request api.QueryRoomVersionCapabilitiesRequest
var response api.QueryRoomVersionCapabilitiesResponse var response api.QueryRoomVersionCapabilitiesResponse
if err := r.queryAPI.QueryRoomVersionCapabilities(r.req.Context(), &request, &response); err != nil { if err := r.queryAPI.QueryRoomVersionCapabilities(r.req.Context(), &request, &response); err != nil {
fmt.Println("r.queryAPI.QueryRoomVersionCapabilities:", err)
return nil, err return nil, err
} }
var supportedVersions []gomatrixserverlib.RoomVersion var supportedVersions []gomatrixserverlib.RoomVersion
@ -321,7 +320,6 @@ func (r joinRoomReq) joinRoomUsingServer(roomID string, server gomatrixserverlib
respMakeJoin, err := r.federation.MakeJoin(r.req.Context(), server, roomID, r.userID, supportedVersions) respMakeJoin, err := r.federation.MakeJoin(r.req.Context(), server, roomID, r.userID, supportedVersions)
if err != nil { if err != nil {
// TODO: Check if the user was not allowed to join the room. // TODO: Check if the user was not allowed to join the room.
fmt.Println("r.federation.MakeJoin:", err)
return nil, err return nil, err
} }
@ -329,7 +327,6 @@ func (r joinRoomReq) joinRoomUsingServer(roomID string, server gomatrixserverlib
// but it's possible that the remote server returned us something "odd" // but it's possible that the remote server returned us something "odd"
err = r.writeToBuilder(&respMakeJoin.JoinEvent, roomID) err = r.writeToBuilder(&respMakeJoin.JoinEvent, roomID)
if err != nil { if err != nil {
fmt.Println("r.writeToBuilder:", err)
return nil, err return nil, err
} }
@ -355,16 +352,12 @@ func (r joinRoomReq) joinRoomUsingServer(roomID string, server gomatrixserverlib
return &res, nil return &res, nil
} }
fmt.Println("Sending", string(event.JSON()))
respSendJoin, err := r.federation.SendJoin(r.req.Context(), server, event, respMakeJoin.RoomVersion) respSendJoin, err := r.federation.SendJoin(r.req.Context(), server, event, respMakeJoin.RoomVersion)
if err != nil { if err != nil {
fmt.Println("r.federation.SendJoin:", err)
return nil, err return nil, err
} }
if err = respSendJoin.Check(r.req.Context(), r.keyRing, event); err != nil { if err = respSendJoin.Check(r.req.Context(), r.keyRing, event); err != nil {
fmt.Println("respSendJoin.Check:", err)
return nil, err return nil, err
} }

3
federationapi/routing/join.go
View file

@ -129,9 +129,6 @@ func SendJoin(
} }
} }
fmt.Println("Content:", string(request.Content()))
fmt.Println("Room version:", verRes.RoomVersion)
event, err := gomatrixserverlib.NewEventFromUntrustedJSON(request.Content(), verRes.RoomVersion) event, err := gomatrixserverlib.NewEventFromUntrustedJSON(request.Content(), verRes.RoomVersion)
if err != nil { if err != nil {
fmt.Println("gomatrixserverlib.NewEventFromUntrustedJSON:", err) fmt.Println("gomatrixserverlib.NewEventFromUntrustedJSON:", err)