p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix pidfile, pid is num use '/proc + string(pid)' can't found it

Browse Source 
Signed-off-by: mingqing <limingqing@cyou-inc.com>
Upstream-commit: 6a033fa03e341f8578721045a91dcbf8015982f6
Component: engine
This commit is contained in:
mingqing
2016-01-14 15:43:40 +08:00
parent b4989a8d3c
commit cc17e2f69a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/pkg/pidfile/pidfile.go
View File

@ -9,6 +9,7 @@ import (
"os"
"path/filepath"
"strconv"
"strings"
)
// 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 {
if pidString, err := ioutil.ReadFile(path); err == nil {
if pid, err := strconv.Atoi(string(pidString)); err == nil {
if _, err := os.Stat(filepath.Join("/proc", string(pid))); err == nil {
if pidByte, err := ioutil.ReadFile(path); err == nil {
pidString := strings.TrimSpace(string(pidByte))
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)
}
}