From 5e7c817223fd746eccf65dfc10c67cb3c28a0cd1 Mon Sep 17 00:00:00 2001
From: Till Faelligen <tfaelligen@gmail.com>
Date: Thu, 19 May 2022 14:38:15 +0200
Subject: [PATCH] Cleanup

---
 clientapi/routing/admin.go      | 1 -
 clientapi/routing/routing.go    | 2 +-
 syncapi/storage/storage_test.go | 4 +---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/clientapi/routing/admin.go b/clientapi/routing/admin.go
index be3452168..1d5706042 100644
--- a/clientapi/routing/admin.go
+++ b/clientapi/routing/admin.go
@@ -65,7 +65,6 @@ func AdminReindex(req *http.Request, cfg *config.ClientAPI, device *userapi.Devi
 		logrus.WithError(err).Error("failed to publish nats message")
 		return jsonerror.InternalServerError()
 	}
-	logrus.Debugf("Indexing events")
 	return util.JSONResponse{
 		Code: http.StatusOK,
 		JSON: struct{}{},
diff --git a/clientapi/routing/routing.go b/clientapi/routing/routing.go
index 17eeed0cf..a3561f235 100644
--- a/clientapi/routing/routing.go
+++ b/clientapi/routing/routing.go
@@ -127,7 +127,7 @@ func Setup(
 	).Methods(http.MethodGet, http.MethodOptions)
 
 	dendriteAdminRouter.Handle("/admin/fulltext/reindex",
-		httputil.MakeAuthAPI("admin_evacuate_room", userAPI, func(req *http.Request, device *userapi.Device) util.JSONResponse {
+		httputil.MakeAuthAPI("admin_fultext_reindex", userAPI, func(req *http.Request, device *userapi.Device) util.JSONResponse {
 			return AdminReindex(req, cfg, device, natsClient)
 		}),
 	).Methods(http.MethodGet, http.MethodOptions)
diff --git a/syncapi/storage/storage_test.go b/syncapi/storage/storage_test.go
index 6f846d45e..70f3f3552 100644
--- a/syncapi/storage/storage_test.go
+++ b/syncapi/storage/storage_test.go
@@ -24,9 +24,7 @@ func MustCreateDatabase(t *testing.T, dbType test.DBType) (storage.Database, fun
 	if err != nil {
 		t.Fatalf("NewSyncServerDatasource returned %s", err)
 	}
-	return db, func() {
-		close()
-	}
+	return db, close
 }
 
 func MustWriteEvents(t *testing.T, db storage.Database, events []*gomatrixserverlib.HeaderedEvent) (positions []types.StreamPosition) {