Check that the pid in pidfile exists before preventing docker to start
This commit is contained in:
parent
acb546cd1b
commit
f079fbe3fa
|
@ -7,9 +7,11 @@ import (
|
||||||
"github.com/dotcloud/docker/rcli"
|
"github.com/dotcloud/docker/rcli"
|
||||||
"github.com/dotcloud/docker/term"
|
"github.com/dotcloud/docker/term"
|
||||||
"io"
|
"io"
|
||||||
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
|
"strconv"
|
||||||
"syscall"
|
"syscall"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -54,8 +56,13 @@ func main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func createPidFile(pidfile string) error {
|
func createPidFile(pidfile string) error {
|
||||||
if _, err := os.Stat(pidfile); err == nil {
|
if pidString, err := ioutil.ReadFile(pidfile); err == nil {
|
||||||
return fmt.Errorf("pid file found, ensure docker is not running or delete %s", pidfile)
|
pid, err := strconv.Atoi(string(pidString))
|
||||||
|
if err == nil {
|
||||||
|
if _, err := os.Stat(fmt.Sprintf("/proc/%d/", pid)); err == nil {
|
||||||
|
return fmt.Errorf("pid file found, ensure docker is not running or delete %s", pidfile)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
file, err := os.Create(pidfile)
|
file, err := os.Create(pidfile)
|
||||||
|
|
Loading…
Reference in New Issue