From 7f83ef43deba3d90a81322ccdef2a94dfac93b92 Mon Sep 17 00:00:00 2001
From: Flavio Castelli <fcastelli@suse.com>
Date: Wed, 10 Apr 2013 12:24:15 +0200
Subject: [PATCH] docker daemon: create file containing PID

Ensure the docker daemon creates a file containing its PID under
/var/run/docker.pid.

The daemon takes care of removing the pid file when it receives either
SIGTERM, SIGINT or SIGKILL.

The daemon also refuses to start when the pidfile is found. An
explanation message is shown to the user when this happens.

This change is required to make docker easier to manage by tools like
checkproc which rely on this information.
Upstream-commit: fb0b375be70e79eaa8349143dceef048db6e0e19
Component: engine
---
 components/engine/docker/docker.go | 44 ++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/components/engine/docker/docker.go b/components/engine/docker/docker.go
index 1b1c21990d..a8f4a9e9a6 100644
--- a/components/engine/docker/docker.go
+++ b/components/engine/docker/docker.go
@@ -2,12 +2,15 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"github.com/dotcloud/docker"
 	"github.com/dotcloud/docker/rcli"
 	"github.com/dotcloud/docker/term"
 	"io"
 	"log"
 	"os"
+	"os/signal"
+	"syscall"
 )
 
 var GIT_COMMIT string
@@ -22,6 +25,7 @@ func main() {
 	flDaemon := flag.Bool("d", false, "Daemon mode")
 	flDebug := flag.Bool("D", false, "Debug mode")
 	bridgeName := flag.String("b", "", "Attach containers to a pre-existing network bridge")
+	pidfile := flag.String("p", "/var/run/docker.pid", "File containing process PID")
 	flag.Parse()
 	if *bridgeName != "" {
 		docker.NetworkBridgeIface = *bridgeName
@@ -37,7 +41,7 @@ func main() {
 			flag.Usage()
 			return
 		}
-		if err := daemon(); err != nil {
+		if err := daemon(*pidfile); err != nil {
 			log.Fatal(err)
 		}
 	} else {
@@ -47,7 +51,43 @@ func main() {
 	}
 }
 
-func daemon() error {
+func createPidFile(pidfile string) error {
+	if _, err := os.Stat(pidfile); err == nil {
+		return fmt.Errorf("pid file found, ensure docker is not running or delete %s", pidfile)
+	}
+
+	file, err := os.Create(pidfile)
+	if err != nil {
+		return err
+	}
+
+	defer file.Close()
+
+	_, err = fmt.Fprintf(file, "%d", os.Getpid())
+	return err
+}
+
+func removePidFile(pidfile string) {
+	if err := os.Remove(pidfile); err != nil {
+		log.Printf("Error removing %s: %s", pidfile, err)
+	}
+}
+
+func daemon(pidfile string) error {
+		if err := createPidFile(pidfile); err != nil {
+			log.Fatal(err)
+		}
+		defer removePidFile(pidfile)
+
+		c := make(chan os.Signal, 1)
+		signal.Notify(c, os.Interrupt, os.Kill, os.Signal(syscall.SIGTERM))
+		go func() {
+			sig := <-c
+			log.Printf("Received signal '%v', exiting\n", sig)
+			removePidFile(pidfile)
+			os.Exit(0)
+		}()
+
 	service, err := docker.NewServer()
 	if err != nil {
 		return err