Stop being lazy and just type out struct{}{}

This commit is contained in:
Michael Schurter 2017-04-13 13:49:23 -07:00
parent 5e908dbf38
commit 01b20cbb59
2 changed files with 4 additions and 6 deletions

View File

@ -15,8 +15,6 @@ import (
"github.com/hashicorp/nomad/nomad/structs"
)
var mark = struct{}{}
const (
// nomadServicePrefix is the first prefix that scopes all Nomad registered
// services
@ -369,10 +367,10 @@ func (c *ServiceClient) RegisterAgent(role string, services []*structs.Service)
// Record IDs for deregistering on shutdown
c.agentLock.Lock()
for _, id := range ops.regServices {
c.agentServices[id.ID] = mark
c.agentServices[id.ID] = struct{}{}
}
for _, id := range ops.regChecks {
c.agentChecks[id.ID] = mark
c.agentChecks[id.ID] = struct{}{}
}
c.agentLock.Unlock()
return nil
@ -481,7 +479,7 @@ func (c *ServiceClient) UpdateTask(allocID string, existing, newTask *structs.Ta
// Check to see what checks were updated
existingChecks := make(map[string]struct{}, len(existingSvc.Checks))
for _, check := range existingSvc.Checks {
existingChecks[createCheckID(existingID, check)] = mark
existingChecks[createCheckID(existingID, check)] = struct{}{}
}
// Register new checks

View File

@ -33,7 +33,7 @@ func newBlockingScriptExec() *blockingScriptExec {
}
func (b *blockingScriptExec) Exec(ctx context.Context, _ string, _ []string) ([]byte, int, error) {
b.running <- mark
b.running <- struct{}{}
cmd := exec.CommandContext(ctx, testtask.Path(), "sleep", "9000h")
err := cmd.Run()
code := 0