Merge branch 'develop' into neilalexander/refactor

This commit is contained in:
Arceliar 2022-08-28 13:39:26 -05:00 committed by GitHub
commit a182fad8d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -85,11 +85,8 @@ func (m *Yggdrasil) StartJSON(configjson []byte) error {
if len(m.config.MulticastInterfaces) > 0 { if len(m.config.MulticastInterfaces) > 0 {
if err := m.multicast.Init(m.core, m.config, logger, nil); err != nil { if err := m.multicast.Init(m.core, m.config, logger, nil); err != nil {
logger.Errorln("An error occurred initialising multicast:", err) logger.Errorln("An error occurred initialising multicast:", err)
return err } else if err := m.multicast.Start(); err != nil {
}
if err := m.multicast.Start(); err != nil {
logger.Errorln("An error occurred starting multicast:", err) logger.Errorln("An error occurred starting multicast:", err)
return err
} }
} }
return nil return nil