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

Allow to delete routes (#1244)

Browse source
This commit is contained in:
Juan Font 2023-03-06 09:05:40 +01:00 • committed by GitHub
parent c9ecdd6ef1
commit ea82035222
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 790 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

10
machine.go
View file

@ -535,6 +535,11 @@ func (h *Headscale) RefreshMachine(machine *Machine, expiry time.Time) error {
// DeleteMachine softs deletes a Machine from the database.
func (h *Headscale) DeleteMachine(machine *Machine) error {
err := h.DeleteMachineRoutes(machine)
if err != nil {
return err
}
if err := h.db.Delete(&machine).Error; err != nil {
return err
}
@ -552,6 +557,11 @@ func (h *Headscale) TouchMachine(machine *Machine) error {
// HardDeleteMachine hard deletes a Machine from the database.
func (h *Headscale) HardDeleteMachine(machine *Machine) error {
err := h.DeleteMachineRoutes(machine)
if err != nil {
return err
}
if err := h.db.Unscoped().Delete(&machine).Error; err != nil {
return err
}