Skip to content

Commit 2560c32

Browse files
authored
adding some sleep on re-registration after machine expired (#1256)
1 parent e38efd3 commit 2560c32

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

protocol_common.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,10 @@ func (h *Headscale) handleRegisterCommon(
131131
Bool("noise", isNoise).
132132
Msg("Machine is waiting for interactive login")
133133

134-
ticker := time.NewTicker(registrationHoldoff)
135134
select {
136135
case <-req.Context().Done():
137136
return
138-
case <-ticker.C:
137+
case <-time.After(registrationHoldoff):
139138
h.handleNewMachineCommon(writer, registerRequest, machineKey, isNoise)
140139

141140
return
@@ -265,6 +264,14 @@ func (h *Headscale) handleRegisterCommon(
265264
return
266265
}
267266

267+
if registerRequest.Followup != "" {
268+
select {
269+
case <-req.Context().Done():
270+
return
271+
case <-time.After(registrationHoldoff):
272+
}
273+
}
274+
268275
// The machine has expired or it is logged out
269276
h.handleMachineExpiredOrLoggedOutCommon(writer, registerRequest, *machine, machineKey, isNoise)
270277

0 commit comments

Comments
 (0)