Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 30

Only calculate online interval once when retrieving hosts (#1457)

Browse source 
This makes a major perf difference, as it reduces the O(# of hosts) queries
down to constant.
This commit is contained in:
Zachary Wasserman 2017-03-30 08:30:05 -07:00 committed by GitHub
parent 587b6592ff
commit 06ed4c2771
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
server/service/endpoint_hosts.go
View file

@ -15,11 +15,7 @@ type hostResponse struct {
DisplayText string `json:"display_text"`
}
func hostResponseForHost(ctx context.Context, svc kolide.Service, host *kolide.Host) (*hostResponse, error) {
onlineInterval, err := svc.ExpectedCheckinInterval(ctx)
if err != nil {
return nil, errors.Wrap(err, "getting expected check-in interval")
}
func hostResponseForHost(ctx context.Context, svc kolide.Service, host *kolide.Host, onlineInterval time.Duration) (*hostResponse, error) {
return &hostResponse{
Host: *host,
Status: host.Status(time.Now(), onlineInterval),
@ -50,7 +46,12 @@ func makeGetHostEndpoint(svc kolide.Service) endpoint.Endpoint {
return getHostResponse{Err: err}, nil
}
resp, err := hostResponseForHost(ctx, svc, host)
onlineInterval, err := svc.ExpectedCheckinInterval(ctx)
if err != nil {
return nil, errors.Wrap(err, "getting expected check-in interval")
}
resp, err := hostResponseForHost(ctx, svc, host, onlineInterval)
if err != nil {
return getHostResponse{Err: err}, nil
}
@ -84,9 +85,14 @@ func makeListHostsEndpoint(svc kolide.Service) endpoint.Endpoint {
return listHostsResponse{Err: err}, nil
}
onlineInterval, err := svc.ExpectedCheckinInterval(ctx)
if err != nil {
return nil, errors.Wrap(err, "getting expected check-in interval")
}
hostResponses := make([]hostResponse, len(hosts), len(hosts))
for i, host := range hosts {
h, err := hostResponseForHost(ctx, svc, host)
h, err := hostResponseForHost(ctx, svc, host, onlineInterval)
if err != nil {
return listHostsResponse{Err: err}, nil
}