Skip to content

Commit

Permalink
Merge branch 'release/0.8.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
takama committed Dec 1, 2016
2 parents 5892600 + 840798d commit 0f5930a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ func main() {
- [Eric Halpern](https://github.com/ehalpern)
- [Yota](https://github.com/nus)
- [Erkan Durmus](https://github.com/derkan)
- [maxxant](https://github.com/maxxant)

All the contributors are welcome. If you would like to be the contributor please accept some rules.
- The pull requests will be accepted only in "develop" branch
Expand Down
2 changes: 1 addition & 1 deletion daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// license that can be found in the LICENSE file.

/*
Package daemon 0.8.0 for use with Go (golang) services.
Package daemon 0.8.1 for use with Go (golang) services.
Package daemon provides primitives for daemonization of golang services.
This package is not provide implementation of user daemon,
Expand Down
7 changes: 4 additions & 3 deletions daemon_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ import (

// Get the daemon properly
func newDaemon(name, description string, dependencies []string) (Daemon, error) {
if _, err := os.Stat("/sbin/initctl"); err == nil {
return &upstartRecord{name, description, dependencies}, nil
}
// newer subsystem must be checked first
if _, err := os.Stat("/run/systemd/system"); err == nil {
return &systemDRecord{name, description, dependencies}, nil
}
if _, err := os.Stat("/sbin/initctl"); err == nil {
return &upstartRecord{name, description, dependencies}, nil
}
return &systemVRecord{name, description, dependencies}, nil
}

Expand Down

0 comments on commit 0f5930a

Please sign in to comment.