luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

agent: persist tokens from API registrations

This commit is contained in:
Ryan Uber 2015-04-27 19:01:02 -07:00
parent 545f3db3fe
commit 30f6f1142e
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
command/agent/agent.go
View File

@ -520,10 +520,14 @@ func (a *Agent) ResumeSync() {
} }
// persistService saves a service definition to a JSON file in the data dir // persistService saves a service definition to a JSON file in the data dir
func (a *Agent) persistService(service *structs.NodeService) error { func (a *Agent) persistService(service *structs.NodeService, token string) error {
svcPath := filepath.Join(a.config.DataDir, servicesDir, stringHash(service.ID)) svcPath := filepath.Join(a.config.DataDir, servicesDir, stringHash(service.ID))
if _, err := os.Stat(svcPath); os.IsNotExist(err) { if _, err := os.Stat(svcPath); os.IsNotExist(err) {
encoded, err := json.Marshal(service) wrapped := &persistedService{
Token: token,
Service: service,
}
encoded, err := json.Marshal(wrapped)
if err != nil { if err != nil {
return nil return nil
} }
@ -552,14 +556,14 @@ func (a *Agent) purgeService(serviceID string) error {
} }
// persistCheck saves a check definition to the local agent's state directory // persistCheck saves a check definition to the local agent's state directory
func (a *Agent) persistCheck(check *structs.HealthCheck, chkType *CheckType) error { func (a *Agent) persistCheck(check *structs.HealthCheck, chkType *CheckType, token string) error {
checkPath := filepath.Join(a.config.DataDir, checksDir, stringHash(check.CheckID)) checkPath := filepath.Join(a.config.DataDir, checksDir, stringHash(check.CheckID))
if _, err := os.Stat(checkPath); !os.IsNotExist(err) { if _, err := os.Stat(checkPath); !os.IsNotExist(err) {
return err return err
} }
// Create the persisted check // Create the persisted check
p := persistedCheck{check, chkType} p := persistedCheck{check, chkType, token}
encoded, err := json.Marshal(p) encoded, err := json.Marshal(p)
if err != nil { if err != nil {
@ -626,7 +630,7 @@ func (a *Agent) AddService(service *structs.NodeService, chkTypes CheckTypes,
// Persist the service to a file // Persist the service to a file
if persist { if persist {
if err := a.persistService(service); err != nil { if err := a.persistService(service, token); err != nil {
return err return err
} }
} }
@ -781,7 +785,7 @@ func (a *Agent) AddCheck(check *structs.HealthCheck, chkType *CheckType,
// Persist the check // Persist the check
if persist { if persist {
return a.persistCheck(check, chkType) return a.persistCheck(check, chkType, token)
} }
return nil return nil
@ -950,10 +954,11 @@ func (a *Agent) loadServices(conf *Config) error {
return err return err
} }
var svc *structs.NodeService var wrapped *persistedService
if err := json.Unmarshal(content, &svc); err != nil { if err := json.Unmarshal(content, &wrapped); err != nil {
return err return err
} }
svc := wrapped.Service
if _, ok := a.state.services[svc.ID]; ok { if _, ok := a.state.services[svc.ID]; ok {
// Purge previously persisted service. This allows config to be // Purge previously persisted service. This allows config to be
@ -964,7 +969,7 @@ func (a *Agent) loadServices(conf *Config) error {
} else { } else {
a.logger.Printf("[DEBUG] agent: restored service definition %q from %q", a.logger.Printf("[DEBUG] agent: restored service definition %q from %q",
svc.ID, filePath) svc.ID, filePath)
return a.AddService(svc, nil, false, "") return a.AddService(svc, nil, false, wrapped.Token)
} }
}) })

1
command/agent/check.go
View File

@ -257,6 +257,7 @@ func (c *CheckTTL) SetStatus(status, output string) {
type persistedCheck struct { type persistedCheck struct {
Check *structs.HealthCheck Check *structs.HealthCheck
ChkType *CheckType ChkType *CheckType
Token string
} }
// CheckHTTP is used to periodically make an HTTP request to // CheckHTTP is used to periodically make an HTTP request to

7
command/agent/structs.go
View File

@ -63,3 +63,10 @@ func (c *CheckDefinition) HealthCheck(node string) *structs.HealthCheck {
} }
return health return health
} }
// persistedService is used to wrap a service definition and bundle it
// with an ACL token so we can restore both at a later agent start.
type persistedService struct {
Token string
Service *structs.NodeService
}