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

Remove RequestMapUpdates function

Browse source
This commit is contained in:
Kristoffer Dalby 2022-02-12 21:04:00 +00:00
parent 6fa0903a8e
commit bb80b679bc
4 changed files with 5 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

15
machine.go
View file

@ -353,13 +353,12 @@ func (h *Headscale) DeleteMachine(machine *Machine) error {
}
machine.Registered = false
namespaceID := machine.NamespaceID
h.db.Save(&machine) // we mark it as unregistered, just in case
if err := h.db.Delete(&machine).Error; err != nil {
return err
}
return h.RequestMapUpdates(namespaceID)
return nil
}
func (h *Headscale) TouchMachine(machine *Machine) error {
@ -377,12 +376,11 @@ func (h *Headscale) HardDeleteMachine(machine *Machine) error {
return err
}
namespaceID := machine.NamespaceID
if err := h.db.Unscoped().Delete(&machine).Error; err != nil {
return err
}
return h.RequestMapUpdates(namespaceID)
return nil
}
// GetHostInfo returns a Hostinfo struct for the machine.
@ -530,7 +528,9 @@ func (machine Machine) toNode(
addrs = append(addrs, ip)
}
allowedIPs := append([]netaddr.IPPrefix{}, addrs...) // we append the node own IP, as it is required by the clients
allowedIPs := append(
[]netaddr.IPPrefix{},
addrs...) // we append the node own IP, as it is required by the clients
if includeRoutes {
routesStr := []string{}
@ -862,11 +862,6 @@ func (h *Headscale) EnableRoutes(machine *Machine, routeStrs ...string) error {
machine.EnabledRoutes = datatypes.JSON(routes)
h.db.Save(&machine)
err = h.RequestMapUpdates(machine.NamespaceID)
if err != nil {
return err
}
return nil
}