dandri/dns-over-https
1
0
Fork 0
mirror of https://github.com/m13253/dns-over-https.git synced 2026-03-30 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add PID file support

Browse Source
This commit is contained in:
Star Brilliant
2018-11-27 17:37:57 +08:00
parent 3083b668ca
commit 35ddf43505
2 changed files with 134 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
doh-client/main.go
View File

@@ -25,14 +25,81 @@ package main
import (
"flag"
"fmt"
"io"
"io/ioutil"
"log"
"os"
"runtime"
"strconv"
)
func checkPIDFile(pidFile string) (bool, error) {
retry:
f, err := os.OpenFile(pidFile, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0666)
if os.IsExist(err) {
pidStr, err := ioutil.ReadFile(pidFile)
if err != nil {
return false, err
}
pid, err := strconv.ParseUint(string(pidStr), 10, 0)
if err != nil {
return false, err
}
_, err = os.Stat(fmt.Sprintf("/proc/%d", pid))
if os.IsNotExist(err) {
err = os.Remove(pidFile)
if err != nil {
return false, err
}
goto retry
} else if err != nil {
return false, err
}
log.Printf("Already running on PID %d, exiting.\n", pid)
return false, nil
} else if err != nil {
return false, err
}
defer f.Close()
_, err = io.WriteString(f, strconv.FormatInt(int64(os.Getpid()), 10))
if err != nil {
return false, err
}
return true, nil
}
func main() {
confPath := flag.String("conf", "doh-client.conf", "Configuration file")
verbose := flag.Bool("verbose", false, "Enable logging")
showVersion := flag.Bool("version", false, "Show software version and exit")
var pidFile *string
// I really want to push the technology forward by recommending cgroup-based
// process tracking. But I understand some cloud service providers have
// their own monitoring system. So this feature is only enabled on Linux and
// BSD series platforms which lacks functionality similar to cgroup.
if runtime.GOOS == "dragonfly" || runtime.GOOS == "freebsd" || runtime.GOOS == "linux" || runtime.GOOS == "netbsd" || runtime.GOOS == "openbsd" {
pidFile = flag.String("pid-file", "", "PID file for legacy supervision systems lacking support for reliable cgroup-based process tracking")
}
flag.Parse()
if *showVersion {
fmt.Printf("doh-server %s\nHomepage: https://github.com/m13253/dns-over-https\n", VERSION)
return
}
if pidFile != nil && *pidFile != "" {
ok, err := checkPIDFile(*pidFile)
if err != nil {
log.Printf("Error checking PID file: %v\n", err)
}
if !ok {
return
}
}
conf, err := loadConfig(*confPath)
if err != nil {
log.Fatalln(err)

67
doh-server/main.go
View File

@@ -25,14 +25,81 @@ package main
import (
"flag"
"fmt"
"io"
"io/ioutil"
"log"
"os"
"runtime"
"strconv"
)
func checkPIDFile(pidFile string) (bool, error) {
retry:
f, err := os.OpenFile(pidFile, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0666)
if os.IsExist(err) {
pidStr, err := ioutil.ReadFile(pidFile)
if err != nil {
return false, err
}
pid, err := strconv.ParseUint(string(pidStr), 10, 0)
if err != nil {
return false, err
}
_, err = os.Stat(fmt.Sprintf("/proc/%d", pid))
if os.IsNotExist(err) {
err = os.Remove(pidFile)
if err != nil {
return false, err
}
goto retry
} else if err != nil {
return false, err
}
log.Printf("Already running on PID %d, exiting.\n", pid)
return false, nil
} else if err != nil {
return false, err
}
defer f.Close()
_, err = io.WriteString(f, strconv.FormatInt(int64(os.Getpid()), 10))
if err != nil {
return false, err
}
return true, nil
}
func main() {
confPath := flag.String("conf", "doh-server.conf", "Configuration file")
verbose := flag.Bool("verbose", false, "Enable logging")
showVersion := flag.Bool("version", false, "Show software version and exit")
var pidFile *string
// I really want to push the technology forward by recommending cgroup-based
// process tracking. But I understand some cloud service providers have
// their own monitoring system. So this feature is only enabled on Linux and
// BSD series platforms which lacks functionality similar to cgroup.
if runtime.GOOS == "dragonfly" || runtime.GOOS == "freebsd" || runtime.GOOS == "linux" || runtime.GOOS == "netbsd" || runtime.GOOS == "openbsd" {
pidFile = flag.String("pid-file", "", "PID file for legacy supervision systems lacking support for reliable cgroup-based process tracking")
}
flag.Parse()
if *showVersion {
fmt.Printf("doh-server %s\nHomepage: https://github.com/m13253/dns-over-https\n", VERSION)
return
}
if pidFile != nil && *pidFile != "" {
ok, err := checkPIDFile(*pidFile)
if err != nil {
log.Printf("Error checking PID file: %v\n", err)
}
if !ok {
return
}
}
conf, err := loadConfig(*confPath)
if err != nil {
log.Fatalln(err)