Fixes

daemon.go

@@ -3,7 +3,6 @@ package daemon
 import (
 	"errors"
 	"os"
-	"syscall"
 )
 
 var errNotSupported = errors.New("daemon: Non-POSIX OS is not supported")
@@ -17,49 +16,6 @@ const (
 // Default file permissions for log and pid files.
 const FILE_PERM = os.FileMode(0640)
 
-// A Context describes daemon context.
-type Context struct {
-	// If PidFileName is non-empty, parent process will try to create and lock
-	// pid file with given name. Child process writes process id to file.
-	PidFileName string
-	// Permissions for new pid file.
-	PidFilePerm os.FileMode
-
-	// If LogFileName is non-empty, parent process will create file with given name
-	// and will link to fd 2 (stderr) for child process.
-	LogFileName string
-	// Permissions for new log file.
-	LogFilePerm os.FileMode
-
-	// If WorkDir is non-empty, the child changes into the directory before
-	// creating the process.
-	WorkDir string
-	// If Chroot is non-empty, the child changes root directory
-	Chroot string
-
-	// If Env is non-nil, it gives the environment variables for the
-	// daemon-process in the form returned by os.Environ.
-	// If it is nil, the result of os.Environ will be used.
-	Env []string
-	// If Args is non-nil, it gives the command-line args for the
-	// daemon-process. If it is nil, the result of os.Args will be used
-	// (without program name).
-	Args []string
-
-	// Credential holds user and group identities to be assumed by a daemon-process.
-	Credential *syscall.Credential
-	// If Umask is non-zero, the daemon-process call Umask() func with given value.
-	Umask int
-
-	// Struct contains only serializable public fields (!!!)
-	abspath  string
-	pidFile  *LockFile
-	logFile  *os.File
-	nullFile *os.File
-
-	rpipe, wpipe *os.File
-}
-
 // WasReborn returns true in child process (daemon) and false in parent process.
 func WasReborn() bool {
 	return os.Getenv(MARK_NAME) == MARK_VALUE
@@ -75,7 +31,7 @@ func (d *Context) Reborn() (child *os.Process, err error) {
 	return d.reborn()
 }
 
-// Search search daemons process by given in context pid file name.
+// Search searches daemons process by given in context pid file name.
 // If success returns pointer on daemons os.Process structure,
 // else returns error. Returns nil if filename is empty.
 func (d *Context) Search() (daemon *os.Process, err error) {

daemon_stub.go

@@ -6,6 +6,39 @@ import (
 	"os"
 )
 
+// A Context describes daemon context.
+type Context struct {
+	// If PidFileName is non-empty, parent process will try to create and lock
+	// pid file with given name. Child process writes process id to file.
+	PidFileName string
+	// Permissions for new pid file.
+	PidFilePerm os.FileMode
+
+	// If LogFileName is non-empty, parent process will create file with given name
+	// and will link to fd 2 (stderr) for child process.
+	LogFileName string
+	// Permissions for new log file.
+	LogFilePerm os.FileMode
+
+	// If WorkDir is non-empty, the child changes into the directory before
+	// creating the process.
+	WorkDir string
+	// If Chroot is non-empty, the child changes root directory
+	Chroot string
+
+	// If Env is non-nil, it gives the environment variables for the
+	// daemon-process in the form returned by os.Environ.
+	// If it is nil, the result of os.Environ will be used.
+	Env []string
+	// If Args is non-nil, it gives the command-line args for the
+	// daemon-process. If it is nil, the result of os.Args will be used
+	// (without program name).
+	Args []string
+
+	// If Umask is non-zero, the daemon-process call Umask() func with given value.
+	Umask int
+}
+
 func (d *Context) reborn() (child *os.Process, err error) {
 	return nil, errNotSupported
 }
@@ -15,5 +48,5 @@ func (d *Context) search() (daemon *os.Process, err error) {
 }
 
 func (d *Context) release() (err error) {
-	return nil, errNotSupported
+	return errNotSupported
 }

daemon_unix.go

@@ -11,6 +11,48 @@ import (
 	"github.com/kardianos/osext"
 )
 
+// A Context describes daemon context.
+type Context struct {
+	// If PidFileName is non-empty, parent process will try to create and lock
+	// pid file with given name. Child process writes process id to file.
+	PidFileName string
+	// Permissions for new pid file.
+	PidFilePerm os.FileMode
+
+	// If LogFileName is non-empty, parent process will create file with given name
+	// and will link to fd 2 (stderr) for child process.
+	LogFileName string
+	// Permissions for new log file.
+	LogFilePerm os.FileMode
+
+	// If WorkDir is non-empty, the child changes into the directory before
+	// creating the process.
+	WorkDir string
+	// If Chroot is non-empty, the child changes root directory
+	Chroot string
+
+	// If Env is non-nil, it gives the environment variables for the
+	// daemon-process in the form returned by os.Environ.
+	// If it is nil, the result of os.Environ will be used.
+	Env []string
+	// If Args is non-nil, it gives the command-line args for the
+	// daemon-process. If it is nil, the result of os.Args will be used.
+	Args []string
+
+	// Credential holds user and group identities to be assumed by a daemon-process.
+	Credential *syscall.Credential
+	// If Umask is non-zero, the daemon-process call Umask() func with given value.
+	Umask int
+
+	// Struct contains only serializable public fields (!!!)
+	abspath  string
+	pidFile  *LockFile
+	logFile  *os.File
+	nullFile *os.File
+
+	rpipe, wpipe *os.File
+}
+
 func (d *Context) reborn() (child *os.Process, err error) {
 	if !WasReborn() {
 		child, err = d.parent()

examples/cmd/gd-simple/simple.go

@@ -2,10 +2,11 @@ package main
 
 import (
 	"fmt"
-	"github.com/sevlyar/go-daemon"
 	"html"
 	"log"
 	"net/http"
+
+	"github.com/sevlyar/go-daemon"
 )
 
 // To terminate the daemon use:
@@ -34,10 +35,10 @@ func main() {
 	log.Print("- - - - - - - - - - - - - - -")
 	log.Print("daemon started")
 
-	serveHttp()
+	serveHTTP()
 }
 
-func serveHttp() {
+func serveHTTP() {
 	http.HandleFunc("/", httpHandler)
 	http.ListenAndServe("127.0.0.1:8080", nil)
 }

lock_file.go

@@ -8,7 +8,7 @@ import (
 )
 
 var (
-	// ErrWoldBlock indicates on locking pid-file by another process.
+	// ErrWouldBlock indicates on locking pid-file by another process.
 	ErrWouldBlock = errors.New("daemon: Resource temporarily unavailable")
 )