mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 13:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into kegan/redactions-4

Browse source
This commit is contained in:
Kegan Dougal 2020-07-08 16:42:24 +01:00
parent 59fb1e38ba 6bee6e77d9
commit 432e4a2777
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/gobind/monolith.go
View file

@ -95,6 +95,8 @@ func (m *DendriteMonolith) Start() {
cfg.Database.AppService = config.DataSource(fmt.Sprintf("file:%s/dendrite-appservice.db", m.StorageDirectory)) cfg.Database.AppService = config.DataSource(fmt.Sprintf("file:%s/dendrite-appservice.db", m.StorageDirectory))
cfg.Database.CurrentState = config.DataSource(fmt.Sprintf("file:%s/dendrite-currentstate.db", m.StorageDirectory)) cfg.Database.CurrentState = config.DataSource(fmt.Sprintf("file:%s/dendrite-currentstate.db", m.StorageDirectory))
cfg.Database.Naffka = config.DataSource(fmt.Sprintf("file:%s/dendrite-naffka.db", m.StorageDirectory)) cfg.Database.Naffka = config.DataSource(fmt.Sprintf("file:%s/dendrite-naffka.db", m.StorageDirectory))
cfg.Media.BasePath = config.Path(fmt.Sprintf("%s/tmp", m.StorageDirectory))
cfg.Media.AbsBasePath = config.Path(fmt.Sprintf("%s/tmp", m.StorageDirectory))
if err = cfg.Derive(); err != nil { if err = cfg.Derive(); err != nil {
panic(err) panic(err)
} }

4
cmd/dendrite-demo-yggdrasil/main.go
View file

@ -62,7 +62,9 @@ func main() {
} }
ygg.SetMulticastEnabled(true) ygg.SetMulticastEnabled(true)
if instancePeer != nil && *instancePeer != "" { if instancePeer != nil && *instancePeer != "" {
ygg.SetStaticPeer(*instancePeer) if err := ygg.SetStaticPeer(*instancePeer); err != nil {
logrus.WithError(err).Error("Failed to set static peer")
}
} }
cfg := &config.Dendrite{} cfg := &config.Dendrite{}

2
cmd/dendrite-demo-yggdrasil/yggconn/node.go
View file

@ -138,7 +138,7 @@ func Setup(instanceName, storageDirectory string) (*Node, error) {
MaxIncomingUniStreams: 0, MaxIncomingUniStreams: 0,
KeepAlive: true, KeepAlive: true,
MaxIdleTimeout: time.Second * 60, MaxIdleTimeout: time.Second * 60,
HandshakeTimeout: time.Second * 30, HandshakeTimeout: time.Second * 15,
} }
n.log.Println("Public curve25519:", n.core.EncryptionPublicKey()) n.log.Println("Public curve25519:", n.core.EncryptionPublicKey())

8
mediaapi/routing/routing.go
View file

@ -53,12 +53,16 @@ func Setup(
activeThumbnailGeneration := &types.ActiveThumbnailGeneration{ activeThumbnailGeneration := &types.ActiveThumbnailGeneration{
PathToResult: map[string]*types.ThumbnailGenerationResult{}, PathToResult: map[string]*types.ThumbnailGenerationResult{},
} }
r0mux.Handle("/upload", httputil.MakeAuthAPI(
uploadHandler := httputil.MakeAuthAPI(
"upload", userAPI, "upload", userAPI,
func(req *http.Request, _ *userapi.Device) util.JSONResponse { func(req *http.Request, _ *userapi.Device) util.JSONResponse {
return Upload(req, cfg, db, activeThumbnailGeneration) return Upload(req, cfg, db, activeThumbnailGeneration)
}, },
)).Methods(http.MethodPost, http.MethodOptions) )
r0mux.Handle("/upload", uploadHandler).Methods(http.MethodPost, http.MethodOptions)
v1mux.Handle("/upload", uploadHandler).Methods(http.MethodPost, http.MethodOptions)
activeRemoteRequests := &types.ActiveRemoteRequests{ activeRemoteRequests := &types.ActiveRemoteRequests{
MXCToResult: map[string]*types.RemoteRequestResult{}, MXCToResult: map[string]*types.RemoteRequestResult{},