From 50bb441215519339fb39fd6ef7ea5676ac53a309 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 25 Mar 2020 17:57:25 +0000 Subject: [PATCH] Update gomatrixserverlib --- go.mod | 2 +- go.sum | 10 ++++++++++ roomserver/input/input.go | 4 ---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 3f9de5218..7fb061c89 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/matrix-org/go-http-js-libp2p v0.0.0-20200318135427-31631a9ef51f github.com/matrix-org/go-sqlite3-js v0.0.0-20200304164012-aa524245b658 github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26 - github.com/matrix-org/gomatrixserverlib v0.0.0-20200325163624-c51df36ecb1e + github.com/matrix-org/gomatrixserverlib v0.0.0-20200325175108-22fa4c36a0c7 github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1 github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7 github.com/mattn/go-sqlite3 v2.0.2+incompatible diff --git a/go.sum b/go.sum index 1f81766e6..0b1b1296e 100644 --- a/go.sum +++ b/go.sum @@ -134,6 +134,16 @@ github.com/matrix-org/gomatrixserverlib v0.0.0-20200325145347-4c5d0cbc87b4 h1:fA github.com/matrix-org/gomatrixserverlib v0.0.0-20200325145347-4c5d0cbc87b4/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= github.com/matrix-org/gomatrixserverlib v0.0.0-20200325163624-c51df36ecb1e h1:yfBGdUqr9uRcClTrIwl1/XIFvM5V1t3y+AIR29F1U3w= github.com/matrix-org/gomatrixserverlib v0.0.0-20200325163624-c51df36ecb1e/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200325170457-bfd5fdb4127e h1:FUzhkQ+t/zrZkjrNRtusuUNQqkIf9I1P4ttKwwd77i4= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200325170457-bfd5fdb4127e/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200325171332-c1f8f5d11057 h1:J3rlEdUMEFeda5l41g9u1wql21GwQkNxH42SXqLkaQo= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200325171332-c1f8f5d11057/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200325173720-c273a574f124 h1:wgldXHFa28uTQqz3avtP5aQg80UXtXRXcysZw/m5ozU= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200325173720-c273a574f124/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200325174455-fc9d25db2565 h1:DU2Zn0QloACuSR53h57Pw1l1c0mzXWhwXoZY3GNDgeo= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200325174455-fc9d25db2565/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200325175108-22fa4c36a0c7 h1:4lzSBzW2xPlSvVIv0NFW2oy+dS2MPT0PK+Thl/WLo84= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200325175108-22fa4c36a0c7/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1 h1:osLoFdOy+ChQqVUn2PeTDETFftVkl4w9t/OW18g3lnk= github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1/go.mod h1:cXoYQIENbdWIQHt1SyCo6Bl3C3raHwJ0wgVrXHSqf+A= github.com/matrix-org/util v0.0.0-20171127121716-2e2df66af2f5 h1:W7l5CP4V7wPyPb4tYE11dbmeAOwtFQBTW0rf4OonOS8= diff --git a/roomserver/input/input.go b/roomserver/input/input.go index 956afc640..bd029d8df 100644 --- a/roomserver/input/input.go +++ b/roomserver/input/input.go @@ -18,7 +18,6 @@ package input import ( "context" "encoding/json" - "fmt" "net/http" "sync" @@ -62,19 +61,16 @@ func (r *RoomserverInputAPI) InputRoomEvents( request *api.InputRoomEventsRequest, response *api.InputRoomEventsResponse, ) (err error) { - fmt.Println("Starting InputRoomEvents") // We lock as processRoomEvent can only be called once at a time r.mutex.Lock() defer r.mutex.Unlock() for i := range request.InputRoomEvents { if response.EventID, err = processRoomEvent(ctx, r.DB, r, request.InputRoomEvents[i]); err != nil { - fmt.Println("processRoomEvent:", err) return err } } for i := range request.InputInviteEvents { if err = processInviteEvent(ctx, r.DB, r, request.InputInviteEvents[i]); err != nil { - fmt.Println("processInviteEvent:", err) return err } }