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

Update config

Browse source
This commit is contained in:
Neil Alexander 2020-06-09 15:57:49 +01:00
parent f5ce0325ac
commit 4dc166a6ca
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ import (
) )
type Node struct { type Node struct {
core yggdrasil.Core core *yggdrasil.Core
config *yggdrasilconfig.NodeConfig config *yggdrasilconfig.NodeConfig
state *yggdrasilconfig.NodeState state *yggdrasilconfig.NodeState
admin *yggdrasiladmin.AdminSocket admin *yggdrasiladmin.AdminSocket
@ -33,7 +33,8 @@ type Node struct {
} }
func Setup(instanceName string) (*Node, error) { func Setup(instanceName string) (*Node, error) {
n := Node{ n := &Node{
core: &yggdrasil.Core{},
config: yggdrasilconfig.GenerateConfig(), config: yggdrasilconfig.GenerateConfig(),
admin: &yggdrasiladmin.AdminSocket{}, admin: &yggdrasiladmin.AdminSocket{},
multicast: &yggdrasilmulticast.Multicast{}, multicast: &yggdrasilmulticast.Multicast{},
@ -41,6 +42,7 @@ func Setup(instanceName string) (*Node, error) {
incoming: make(chan *yamux.Stream), incoming: make(chan *yamux.Stream),
} }
n.config.AdminListen = fmt.Sprintf("unix://./%s-yggdrasil.sock", instanceName) n.config.AdminListen = fmt.Sprintf("unix://./%s-yggdrasil.sock", instanceName)
n.config.MulticastInterfaces = []string{".*"}
yggfile := fmt.Sprintf("%s-yggdrasil.conf", instanceName) yggfile := fmt.Sprintf("%s-yggdrasil.conf", instanceName)
if _, err := os.Stat(yggfile); !os.IsNotExist(err) { if _, err := os.Stat(yggfile); !os.IsNotExist(err) {
@ -69,14 +71,13 @@ func Setup(instanceName string) (*Node, error) {
if err != nil { if err != nil {
panic(err) panic(err)
} }
n.core.UpdateConfig(n.config) if err = n.admin.Init(n.core, n.state, n.log, nil); err != nil {
if err = n.admin.Init(&n.core, n.state, n.log, nil); err != nil {
panic(err) panic(err)
} }
if err = n.admin.Start(); err != nil { if err = n.admin.Start(); err != nil {
panic(err) panic(err)
} }
if err = n.multicast.Init(&n.core, n.state, n.log, nil); err != nil { if err = n.multicast.Init(n.core, n.state, n.log, nil); err != nil {
panic(err) panic(err)
} }
if err = n.multicast.Start(); err != nil { if err = n.multicast.Start(); err != nil {
@ -95,7 +96,7 @@ func Setup(instanceName string) (*Node, error) {
go n.listenFromYgg() go n.listenFromYgg()
return &n, nil return n, nil
} }
func (n *Node) EncryptionPublicKey() string { func (n *Node) EncryptionPublicKey() string {