From 4370a808e394e23f36dfd61fd82bba95720ae075 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 8 Jul 2020 16:24:31 +0100 Subject: [PATCH] Fix media path for iOS gobind build --- build/gobind/monolith.go | 2 ++ cmd/dendrite-demo-yggdrasil/yggconn/node.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/gobind/monolith.go b/build/gobind/monolith.go index 5f4c5513..d220fabc 100644 --- a/build/gobind/monolith.go +++ b/build/gobind/monolith.go @@ -95,6 +95,8 @@ func (m *DendriteMonolith) Start() { 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.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 { panic(err) } diff --git a/cmd/dendrite-demo-yggdrasil/yggconn/node.go b/cmd/dendrite-demo-yggdrasil/yggconn/node.go index 79a56c8e..89fb69b5 100644 --- a/cmd/dendrite-demo-yggdrasil/yggconn/node.go +++ b/cmd/dendrite-demo-yggdrasil/yggconn/node.go @@ -138,7 +138,7 @@ func Setup(instanceName, storageDirectory string) (*Node, error) { MaxIncomingUniStreams: 0, KeepAlive: true, MaxIdleTimeout: time.Second * 60, - HandshakeTimeout: time.Second * 30, + HandshakeTimeout: time.Second * 15, } n.log.Println("Public curve25519:", n.core.EncryptionPublicKey())