TheArchive/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-12-24 08:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make lastStateChange namespaced

Browse Source
This commit is contained in:
Kristoffer Dalby 2021-08-19 18:19:26 +01:00
parent 48ef6e5a6f
commit b0ec945dbb
No known key found for this signature in database
GPG Key ID: 09F62DC067465735
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app.go
View File

@ -60,8 +60,7 @@ type Headscale struct {
clientsUpdateChannels sync.Map
lastStateChangeMutex sync.RWMutex
lastStateChange time.Time
lastStateChange sync.Map
}
// NewHeadscale returns the Headscale app
@ -94,7 +93,6 @@ func NewHeadscale(cfg Config) (*Headscale, error) {
privateKey: privKey,
publicKey: &pubKey,
aclRules: &tailcfg.FilterAllowAll, // default allowall
lastStateChange: time.Now().UTC(),
}
err = h.initDB()
@ -229,17 +227,19 @@ func (h *Headscale) Serve() error {
return err
}
func (h *Headscale) setLastStateChangeToNow() {
h.lastStateChangeMutex.Lock()
func (h *Headscale) setLastStateChangeToNow(namespace string) {
now := time.Now().UTC()
h.lastStateChange.Store(namespace, now)
}
func (h *Headscale) getLastStateChange(namespace string) time.Time {
if wrapped, ok := h.lastStateChange.Load(namespace); ok {
lastChange, _ := wrapped.(time.Time)
return lastChange
}
now := time.Now().UTC()
h.lastStateChange = now
h.lastStateChangeMutex.Unlock()
}
func (h *Headscale) getLastStateChange() time.Time {
h.lastStateChangeMutex.RLock()
defer h.lastStateChangeMutex.RUnlock()
return h.lastStateChange
h.lastStateChange.Store(namespace, now)
return now
}

2
machine.go
View File

@ -320,7 +320,7 @@ func (h *Headscale) isOutdated(m *Machine) bool {
return true
}
lastChange := h.getLastStateChange()
lastChange := h.getLastStateChange(m.Namespace.Name)
log.Trace().
Str("func", "keepAlive").
Str("machine", m.Name).

6
poll.go
View File

@ -123,7 +123,7 @@ func (h *Headscale) PollNetMapHandler(c *gin.Context) {
// There has been an update to _any_ of the nodes that the other nodes would
// need to know about
h.setLastStateChangeToNow()
h.setLastStateChangeToNow(m.Namespace.Name)
// The request is not ReadOnly, so we need to set up channels for updating
// peers via longpoll
@ -310,7 +310,7 @@ func (h *Headscale) PollNetMapStream(
Str("handler", "PollNetMapStream").
Str("machine", m.Name).
Time("last_successful_update", *m.LastSuccessfulUpdate).
Time("last_state_change", h.getLastStateChange()).
Time("last_state_change", h.getLastStateChange(m.Namespace.Name)).
Msgf("There has been updates since the last successful update to %s", m.Name)
data, err := h.getMapResponse(mKey, req, m)
if err != nil {
@ -348,7 +348,7 @@ func (h *Headscale) PollNetMapStream(
Str("handler", "PollNetMapStream").
Str("machine", m.Name).
Time("last_successful_update", *m.LastSuccessfulUpdate).
Time("last_state_change", h.getLastStateChange()).
Time("last_state_change", h.getLastStateChange(m.Namespace.Name)).
Msgf("%s is up to date", m.Name)
}
return true