status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-10 22:06:20 +00:00
Code Issues Projects Releases Wiki Activity

agent: Minor cleanups

Browse Source
This commit is contained in:
Armon Dadgar 2014-05-06 12:43:33 -07:00
parent cdc59aa5d3
commit 1256bf37f0
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
command/agent/agent.go
View File

@ -107,6 +107,7 @@ func Create(config *Config, logOutput io.Writer) (*Agent, error) {
return nil, err return nil, err
} }
// Write out the PID file if necessary
err = agent.storePid() err = agent.storePid()
if err != nil { if err != nil {
return nil, err return nil, err
@ -507,49 +508,50 @@ func (a *Agent) Stats() map[string]map[string]string {
return stats return stats
} }
// storePid is used to write out our PID to a file if necessary
func (a *Agent) storePid() error { func (a *Agent) storePid() error {
// Quit fast if no pidfile
pidPath := a.config.PidFile pidPath := a.config.PidFile
if pidPath == "" {
if pidPath != "" { return nil
pid := os.Getpid()
pidFile, err := os.OpenFile(pidPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0666)
if err != nil {
return fmt.Errorf("Could not open pid file: %v", err)
}
defer pidFile.Close()
_, err = pidFile.WriteString(fmt.Sprintf("%d", pid))
if err != nil {
return fmt.Errorf("Could not write to pid file: %s", err)
}
} }
// Open the PID file
pidFile, err := os.OpenFile(pidPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0666)
if err != nil {
return fmt.Errorf("Could not open pid file: %v", err)
}
defer pidFile.Close()
// Write out the PID
pid := os.Getpid()
_, err = pidFile.WriteString(fmt.Sprintf("%d", pid))
if err != nil {
return fmt.Errorf("Could not write to pid file: %s", err)
}
return nil return nil
} }
// deletePid is used to delete our PID on exit
func (a *Agent) deletePid() error { func (a *Agent) deletePid() error {
// Quit fast if no pidfile
pidPath := a.config.PidFile pidPath := a.config.PidFile
if pidPath == "" {
if pidPath != "" { return nil
stat, err := os.Stat(pidPath)
if err != nil {
return fmt.Errorf("Could not remove pid file: %s", err)
}
if stat.IsDir() {
return fmt.Errorf("Specified pid file path is directory")
}
err = os.Remove(pidPath)
if err != nil {
return fmt.Errorf("Could not remove pid file: %s", err)
}
} }
stat, err := os.Stat(pidPath)
if err != nil {
return fmt.Errorf("Could not remove pid file: %s", err)
}
if stat.IsDir() {
return fmt.Errorf("Specified pid file path is directory")
}
err = os.Remove(pidPath)
if err != nil {
return fmt.Errorf("Could not remove pid file: %s", err)
}
return nil return nil
} }