Merge branch 'main' into magic-dns-support

This commit is contained in:
Juan Font 2021-10-04 19:45:12 +02:00 committed by GitHub
commit 040a18e6f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 76 additions and 26 deletions

View file

@ -317,7 +317,8 @@ func (h *Headscale) notifyChangesToPeers(m *Machine) {
Str("func", "notifyChangesToPeers").
Str("machine", m.Name).
Str("peer", p.Name).
Msgf("Peer %s does not appear to be polling", p.Name)
Msgf("Peer %s does not have an open update client, skipping.", p.Name)
continue
}
log.Trace().
Str("func", "notifyChangesToPeers").
@ -388,11 +389,12 @@ func (h *Headscale) sendRequestOnUpdateChannel(m *tailcfg.Node) error {
Msgf("Notified machine %s", m.Name)
}
} else {
err := errors.New("machine does not have an open update channel")
log.Info().
Str("func", "requestUpdate").
Str("machine", m.Name).
Msgf("Machine %s does not appear to be polling", m.Name)
return errors.New("machine does not seem to be polling")
Msgf("Machine %s does not have an open update channel", m.Name)
return err
}
return nil
}