synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-03 16:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(coderd/provisionerdserver): use s.timeNow (#11267)

Browse Source
This commit is contained in:
Cian Johnston
2023-12-18 17:11:50 +00:00
committed by GitHub
parent c35b560c87
commit ff61475239
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
coderd/provisionerdserver/provisionerdserver.go
View File

@ -183,16 +183,6 @@ func NewServer(
if options.HeartbeatInterval == 0 { if options.HeartbeatInterval == 0 {
options.HeartbeatInterval = DefaultHeartbeatInterval options.HeartbeatInterval = DefaultHeartbeatInterval
} }
// Avoid a nil check in s.heartbeat.
if options.HeartbeatFn == nil {
options.HeartbeatFn = func(hbCtx context.Context) error {
//nolint:gocritic // This is specifically for updating the last seen at timestamp.
return db.UpdateProvisionerDaemonLastSeenAt(dbauthz.AsSystemRestricted(hbCtx), database.UpdateProvisionerDaemonLastSeenAtParams{
ID: id,
LastSeenAt: sql.NullTime{Time: time.Now(), Valid: true},
})
}
}
s := &server{ s := &server{
lifecycleCtx: lifecycleCtx, lifecycleCtx: lifecycleCtx,
@ -219,6 +209,10 @@ func NewServer(
heartbeatFn: options.HeartbeatFn, heartbeatFn: options.HeartbeatFn,
} }
if s.heartbeatFn == nil {
s.heartbeatFn = s.defaultHeartbeat
}
go s.heartbeatLoop() go s.heartbeatLoop()
return s, nil return s, nil
} }
@ -276,6 +270,14 @@ func (s *server) heartbeat(ctx context.Context) error {
} }
} }
func (s *server) defaultHeartbeat(ctx context.Context) error {
//nolint:gocritic // This is specifically for updating the last seen at timestamp.
return s.Database.UpdateProvisionerDaemonLastSeenAt(dbauthz.AsSystemRestricted(ctx), database.UpdateProvisionerDaemonLastSeenAtParams{
ID: s.ID,
LastSeenAt: sql.NullTime{Time: s.timeNow(), Valid: true},
})
}
// AcquireJob queries the database to lock a job. // AcquireJob queries the database to lock a job.
// //
// Deprecated: This method is only available for back-level provisioner daemons. // Deprecated: This method is only available for back-level provisioner daemons.