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

Don't remove the files, just log an error

Browse source
This commit is contained in:
Kyle Havlovitz 2018-01-19 14:25:51 -08:00
parent 17ec4a9394
commit b651253cb2
No known key found for this signature in database
GPG key ID: 8A5E6B173056AD6C
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
agent/agent.go
View file

@ -2150,22 +2150,12 @@ func (a *Agent) loadServices(conf *config.RuntimeConfig) error {
return fmt.Errorf("failed reading service file %q: %s", file, err) return fmt.Errorf("failed reading service file %q: %s", file, err)
} }
// If the file ended up empty as a result of something like an OS crash, remove
// it for convenience and log about it.
if len(buf) == 0 {
a.logger.Printf("[WARN] Removing leftover empty service file %q", file)
if err := os.Remove(file); err != nil {
a.logger.Printf("[WARN] Error removing leftover empty service file %q: %v", file, err)
}
continue
}
// Try decoding the service definition // Try decoding the service definition
var p persistedService var p persistedService
if err := json.Unmarshal(buf, &p); err != nil { if err := json.Unmarshal(buf, &p); err != nil {
// Backwards-compatibility for pre-0.5.1 persisted services // Backwards-compatibility for pre-0.5.1 persisted services
if err := json.Unmarshal(buf, &p.Service); err != nil { if err := json.Unmarshal(buf, &p.Service); err != nil {
a.logger.Printf("[WARN] Failed decoding service file %q: %s", file, err) a.logger.Printf("[ERR] Failed decoding service file %q: %s", file, err)
continue continue
} }
} }
@ -2242,20 +2232,10 @@ func (a *Agent) loadChecks(conf *config.RuntimeConfig) error {
return fmt.Errorf("failed reading check file %q: %s", file, err) return fmt.Errorf("failed reading check file %q: %s", file, err)
} }
// If the file ended up empty as a result of something like an OS crash, remove
// it for convenience and log about it.
if len(buf) == 0 {
a.logger.Printf("[WARN] Removing leftover empty check file %q", file)
if err := os.Remove(file); err != nil {
a.logger.Printf("[WARN] Error removing leftover empty check file %q: %v", file, err)
}
continue
}
// Decode the check // Decode the check
var p persistedCheck var p persistedCheck
if err := json.Unmarshal(buf, &p); err != nil { if err := json.Unmarshal(buf, &p); err != nil {
a.logger.Printf("[WARN] Failed decoding check file %q: %s", file, err) a.logger.Printf("[ERR] Failed decoding check file %q: %s", file, err)
continue continue
} }
checkID := p.Check.CheckID checkID := p.Check.CheckID