vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #19325 from mingqing/fix-pid-convert-error

Browse source 
fix pidfile, pid is num use '/proc + string(pid)' can't found it
This commit is contained in:
Brian Goff 2016-01-14 16:49:20 -05:00
commit fa7ee8955f
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pidfile/pidfile.go
View file

@ -9,6 +9,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings"
) )
// PIDFile is a file used to store the process ID of a running process. // PIDFile is a file used to store the process ID of a running process.
@ -17,9 +18,10 @@ type PIDFile struct {
} }
func checkPIDFileAlreadyExists(path string) error { func checkPIDFileAlreadyExists(path string) error {
if pidString, err := ioutil.ReadFile(path); err == nil { if pidByte, err := ioutil.ReadFile(path); err == nil {
if pid, err := strconv.Atoi(string(pidString)); err == nil { pidString := strings.TrimSpace(string(pidByte))
if _, err := os.Stat(filepath.Join("/proc", string(pid))); err == nil { if pid, err := strconv.Atoi(pidString); err == nil {
if _, err := os.Stat(filepath.Join("/proc", strconv.Itoa(pid))); err == nil {
return fmt.Errorf("pid file found, ensure docker is not running or delete %s", path) return fmt.Errorf("pid file found, ensure docker is not running or delete %s", path)
} }
} }