mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-05 21:23:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 's7evink/fts' of github.com:matrix-org/dendrite into s7evink/fts

Browse source
This commit is contained in:
Till Faelligen 2022-06-01 06:29:59 +02:00
parent 1a4d898278 7a464c8851
commit cbee079f23
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clientapi/routing/admin.go
View file

@ -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{}{},

2
clientapi/routing/routing.go
View file

@ -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)

4
syncapi/storage/storage_test.go
View file

@ -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) {