From ce9a697dca6010a08255d6d67e286ced1390ab44 Mon Sep 17 00:00:00 2001 From: Remi Reuvekamp Date: Mon, 2 Sep 2019 16:15:37 +0200 Subject: [PATCH] Improve documentation --- roomserver/query/query.go | 7 +++++-- roomserver/roomserver.go | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/roomserver/query/query.go b/roomserver/query/query.go index cab989613..9c5a2fb61 100644 --- a/roomserver/query/query.go +++ b/roomserver/query/query.go @@ -89,7 +89,7 @@ type RoomserverQueryAPIDatabase interface { ) (map[types.EventStateKeyNID]string, error) // Lookup if the roomID has been reserved, and when that reservation was made. GetRoomIDReserved(ctx context.Context, roomID string) (time.Time, error) - // Reserve the room ID. + // Mark the room ID as reserved. ReserveRoomID(ctx context.Context, roomID string) (success bool, err error) } @@ -662,7 +662,10 @@ func getAuthChain( return authEvents, nil } -// QueryReserveRoomID implements api.RoomserverQueryAPI +// QueryReserveRoomID marks the given roomID as reserved if it is not +// yet already reserved. Fails if the room already exists or ID is +// already reserved. +// Implements api.RoomserverQueryAPI func (r *RoomserverQueryAPI) QueryReserveRoomID( ctx context.Context, request *api.QueryReserveRoomIDRequest, diff --git a/roomserver/roomserver.go b/roomserver/roomserver.go index 2ffbf67de..6767f3039 100644 --- a/roomserver/roomserver.go +++ b/roomserver/roomserver.go @@ -15,6 +15,7 @@ package roomserver import ( + "fmt" "net/http" "github.com/matrix-org/dendrite/roomserver/api" @@ -36,6 +37,7 @@ func SetupRoomServerComponent( base *basecomponent.BaseDendrite, ) (api.RoomserverAliasAPI, api.RoomserverInputAPI, api.RoomserverQueryAPI) { roomserverDB, err := storage.Open(string(base.Cfg.Database.RoomServer)) + fmt.Println(base.Cfg.Database) if err != nil { logrus.WithError(err).Panicf("failed to connect to room server db") }