TheArchive/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-27 12:05:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors introduced by merge

Browse Source
This commit is contained in:
Kristoffer Dalby 2022-05-31 11:03:08 +02:00
parent 0676aa11a9
commit a19af04582
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
machine.go
View File

@ -420,7 +420,7 @@ func (h *Headscale) RenameMachine(machine *Machine, newName string) error {
h.setLastStateChangeToNow(machine.Namespace.Name) h.setLastStateChangeToNow(machine.Namespace.Name)
if err := h.db.Save(machine).Error; err != nil { if err := h.db.Save(machine).Error; err != nil {
return fmt.Errorf("failed to rename machine in the database: %w", err) return fmt.Errorf("failed to rename machine in the database: %w", err)
} }
@ -428,7 +428,7 @@ func (h *Headscale) RenameMachine(machine *Machine, newName string) error {
} }
// RefreshMachine takes a Machine struct and sets the expire field to now. // RefreshMachine takes a Machine struct and sets the expire field to now.
func (h *Headscale) RefreshMachine(machine *Machine, expiry time.Time) { func (h *Headscale) RefreshMachine(machine *Machine, expiry time.Time) error {
now := time.Now() now := time.Now()
machine.LastSuccessfulUpdate = &now machine.LastSuccessfulUpdate = &now
@ -437,7 +437,10 @@ func (h *Headscale) RefreshMachine(machine *Machine, expiry time.Time) {
h.setLastStateChangeToNow(machine.Namespace.Name) h.setLastStateChangeToNow(machine.Namespace.Name)
if err := h.db.Save(machine).Error; err != nil { if err := h.db.Save(machine).Error; err != nil {
return fmt.Errorf("failed to refresh machine (update expiration) in the database: %w", err) return fmt.Errorf(
"failed to refresh machine (update expiration) in the database: %w",
err,
)
} }
return nil return nil

2
poll.go
View File

@ -121,7 +121,7 @@ func (h *Headscale) PollNetMapHandler(ctx *gin.Context) {
log.Error(). log.Error().
Str("handler", "PollNetMap"). Str("handler", "PollNetMap").
Str("id", ctx.Param("id")). Str("id", ctx.Param("id")).
Str("machine", machine.Name). Str("machine", machine.Hostname).
Err(err). Err(err).
Msg("Failed to persist/update machine in the database") Msg("Failed to persist/update machine in the database")
ctx.String(http.StatusInternalServerError, ":(") ctx.String(http.StatusInternalServerError, ":(")