diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-05-22 11:43:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-22 11:43:17 +0100 |
| commit | fe82e1f7255c05e0bc7a7872a53cf2a1a78ffaa0 (patch) | |
| tree | 84661722411a9098f1925d2a5192e4c40d0a1122 /cmd/dendrite-demo-libp2p | |
| parent | f223da2f35e690e80c6e3d8c1050f0984ab33a2f (diff) | |
Separate muxes for public and internal APIs (#1056)
* Separate muxes for public and internal APIs
* Update client-api-proxy and federation-api-proxy so they don't add /api to the path
* Tidy up
* Consistent HTTP setup
* Set up prefixes properly
Diffstat (limited to 'cmd/dendrite-demo-libp2p')
| -rw-r--r-- | cmd/dendrite-demo-libp2p/main.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cmd/dendrite-demo-libp2p/main.go b/cmd/dendrite-demo-libp2p/main.go index a04a28e0..3f53cb42 100644 --- a/cmd/dendrite-demo-libp2p/main.go +++ b/cmd/dendrite-demo-libp2p/main.go @@ -47,7 +47,6 @@ import ( "github.com/matrix-org/dendrite/eduserver/cache" - "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" ) @@ -178,12 +177,13 @@ func main() { publicroomsapi.SetupPublicRoomsAPIComponent(&base.Base, deviceDB, publicRoomsDB, rsAPI, federation, nil) // Check this later syncapi.SetupSyncAPIComponent(&base.Base, deviceDB, accountDB, rsAPI, federation, &cfg) - httpHandler := internal.WrapHandlerInCORS(base.Base.APIMux) - - // Set up the API endpoints we handle. /metrics is for prometheus, and is - // not wrapped by CORS, while everything else is - http.Handle("/metrics", promhttp.Handler()) - http.Handle("/", httpHandler) + internal.SetupHTTPAPI( + http.DefaultServeMux, + base.Base.PublicAPIMux, + base.Base.InternalAPIMux, + &cfg, + base.Base.EnableHTTPAPIs, + ) // Expose the matrix APIs directly rather than putting them under a /api path. go func() { |