From e7bdd06e930e06d87e4fdc43ece7e9e217c6da17 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 4 Mar 2021 14:58:19 +0000 Subject: [PATCH] Review comments --- clientapi/routing/register.go | 3 --- setup/base.go | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/clientapi/routing/register.go b/clientapi/routing/register.go index 41e377733..9e0ca51fa 100644 --- a/clientapi/routing/register.go +++ b/clientapi/routing/register.go @@ -46,7 +46,6 @@ import ( "github.com/matrix-org/gomatrixserverlib/tokens" "github.com/matrix-org/util" "github.com/prometheus/client_golang/prometheus" - "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" ) @@ -691,8 +690,6 @@ func handleApplicationServiceRegistration( cfg *config.ClientAPI, userAPI userapi.UserInternalAPI, ) util.JSONResponse { - logrus.Warnf("APPSERVICE Is appservice registration %q", r.Username) - // Check if we previously had issues extracting the access token from the // request. if tokenErr != nil { diff --git a/setup/base.go b/setup/base.go index b22c41e7e..f8a45409f 100644 --- a/setup/base.go +++ b/setup/base.go @@ -290,8 +290,9 @@ func (b *BaseDendrite) CreateClient() *gomatrixserverlib.Client { return client } -// CreateClient creates a new client (normally used for media fetch requests). -// Should only be called once per component. +// CreateAppserviceClient creates a new client for application services. +// It has a specific timeout and obeys TLS validation from the appservice +// config rather than the federation config. func (b *BaseDendrite) CreateAppserviceClient() *gomatrixserverlib.Client { opts := []gomatrixserverlib.ClientOption{ gomatrixserverlib.WithSkipVerify(b.Cfg.AppServiceAPI.DisableTLSValidation),