fix daemon flag transmit error

openatx · Oct 17, 2017 · 1fc367d · 1fc367d
1 parent 8e6b4cd
commit 1fc367d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/build.sh b/build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+#
+
+go generate
+GOOS=linux GOARCH=arm go build -tags vfs
diff --git a/main.go b/main.go
@@ -582,8 +582,10 @@ func ServeHTTP(port int) error {
 
 func runDaemon() {
 	environ := os.Environ()
-	environ = append(environ, "IGNORE_SIGHUP=true")
-	cmd := kexec.Command(os.Args[0], "-p", strconv.Itoa(listenPort))
+	// env:IGNORE_SIGHUP forward stdout and stderr to file
+	// env:ATX_AGENT will ignore -d flag
+	environ = append(environ, "IGNORE_SIGHUP=true", "ATX_AGENT=1")
+	cmd := kexec.Command(os.Args[0], os.Args[1:]...)
 	cmd.Env = environ
 	cmd.Start()
 	select {
@@ -625,7 +627,7 @@ func main() {
 		log.Println("requirements not ready:", err)
 	}
 
-	if *fDaemon {
+	if *fDaemon && os.Getenv("ATX_AGENT") == "" {
 		runDaemon()
 		return
 	}