Use Core.config in init functions

This commit is contained in:
Neil Alexander 2018-12-29 19:14:26 +00:00
parent 219fb96553
commit fa7c4117b4
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 56 additions and 62 deletions

View file

@ -52,7 +52,7 @@ func (a *admin) addHandler(name string, args []string, handler func(admin_info)
}
// init runs the initial admin setup.
func (a *admin) init(c *Core, listenaddr string) {
func (a *admin) init(c *Core) {
a.core = c
a.reconfigure = make(chan bool, 1)
go func() {
@ -69,7 +69,9 @@ func (a *admin) init(c *Core, listenaddr string) {
}
}
}()
a.listenaddr = listenaddr
a.core.configMutex.RLock()
a.listenaddr = a.core.config.AdminListen
a.core.configMutex.RUnlock()
a.addHandler("list", []string{}, func(in admin_info) (admin_info, error) {
handlers := make(map[string]interface{})
for _, handler := range a.handlers {