move router member initialization into router.init

This commit is contained in:
Arceliar 2019-08-23 20:29:16 -05:00
parent 9835c63818
commit ebd806f27a
2 changed files with 3 additions and 3 deletions

View File

@ -73,9 +73,6 @@ func (c *Core) init() error {
c.log.Warnln("SigningPublicKey in config is incorrect, should be", sp) c.log.Warnln("SigningPublicKey in config is incorrect, should be", sp)
} }
c.router.searches.init(c)
c.router.dht.init(c)
c.router.sessions.init(c)
c.peers.init(c) c.peers.init(c)
c.router.init(c) c.router.init(c)
c.switchTable.init(c) // TODO move before peers? before router? c.switchTable.init(c) // TODO move before peers? before router?

View File

@ -73,6 +73,9 @@ func (r *router) init(core *Core) {
r.core.config.Mutex.RLock() r.core.config.Mutex.RLock()
r.nodeinfo.setNodeInfo(r.core.config.Current.NodeInfo, r.core.config.Current.NodeInfoPrivacy) r.nodeinfo.setNodeInfo(r.core.config.Current.NodeInfo, r.core.config.Current.NodeInfoPrivacy)
r.core.config.Mutex.RUnlock() r.core.config.Mutex.RUnlock()
r.dht.init(r.core)
r.searches.init(r.core)
r.sessions.init(r.core)
} }
// Starts the mainLoop goroutine. // Starts the mainLoop goroutine.