eyjhb/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Resolve merge conflict

Browse source
This commit is contained in:
Kristoffer Dalby 2021-10-03 11:01:13 +01:00
commit 1bddf1147b
No known key found for this signature in database
GPG key ID: 09F62DC067465735
4 changed files with 44 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
machine.go
View file

@ -233,7 +233,8 @@ func (h *Headscale) notifyChangesToPeers(m *Machine) {
Str("func", "notifyChangesToPeers").
Str("machine", m.Name).
Str("peer", peer.Name).
Msgf("Peer %s does not appear to be polling", peer.Name)
Msgf("Peer %s does not have an open update client, skipping.", peer.Name)
continue
}
log.Trace().
Str("func", "notifyChangesToPeers").
@ -304,11 +305,12 @@ func (h *Headscale) sendRequestOnUpdateChannel(m *Machine) 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
}