diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | daemon.go | 13 | ||||
-rw-r--r-- | main.go | 21 |
3 files changed, 20 insertions, 16 deletions
@@ -35,7 +35,7 @@ lint: complexity: go get github.com/fzipp/gocyclo - gocyclo -over 7 $(wildcard *.go) + gocyclo -over 8 $(wildcard *.go) test: go get golang.org/x/tools/cmd/cover @@ -1,17 +1,16 @@ package main import ( + "encoding/json" "log" "os" "os/exec" - "os/user" - - "encoding/json" - "fmt" - "github.com/kardianos/osext" "os/signal" + "os/user" "strconv" "syscall" + + "github.com/kardianos/osext" ) const daemonRunProgram = "daemon-run" @@ -21,7 +20,7 @@ func daemonMain() { return } - fmt.Printf("Starting the daemon as unprivileged user (uid: %d, gid: %d)...\n", syscall.Getuid(), syscall.Getgid()) + log.Printf("Starting the daemon as unprivileged user (uid: %d, gid: %d)...", syscall.Getuid(), syscall.Getgid()) // read the configuration from the pipe "ExtraFiles" var config appConfig @@ -113,7 +112,7 @@ func daemonize(config appConfig, cmdUser string) { log.Fatalln(err) } }() - fmt.Printf("Running the daemon as unprivileged user: %v...\n", cmdUser) + log.Printf("Running the daemon as unprivileged user: %v...", cmdUser) cmd, err := daemonReexec(cmdUser, daemonRunProgram) if err != nil { @@ -2,7 +2,6 @@ package main import ( "flag" - "fmt" "log" "net" "os" @@ -15,9 +14,7 @@ var VERSION = "dev" // REVISION stores the information about the git revision of application var REVISION = "HEAD" -func main() { - daemonMain() - +func appMain() { var listenHTTP = flag.String("listen-http", ":80", "The address to listen for HTTP requests") var listenHTTPS = flag.String("listen-https", "", "The address to listen for HTTPS requests") var listenProxy = flag.String("listen-proxy", "", "The address to listen for proxy requests") @@ -29,8 +26,8 @@ func main() { var pagesDomain = flag.String("pages-domain", "gitlab-example.com", "The domain to serve static pages") var pagesUser = flag.String("pages-user", "", "Drop privileges to this user") - fmt.Printf("GitLab Pages Daemon %s (%s)\n", VERSION, REVISION) - fmt.Printf("URL: https://gitlab.com/gitlab-org/gitlab-pages\n") + log.Printf("GitLab Pages Daemon %s (%s)", VERSION, REVISION) + log.Printf("URL: https://gitlab.com/gitlab-org/gitlab-pages\n") flag.Parse() err := os.Chdir(*pagesRoot) @@ -71,7 +68,15 @@ func main() { if *pagesUser != "" { daemonize(config, *pagesUser) - } else { - runApp(config) + return } + + runApp(config) +} + +func main() { + log.SetOutput(os.Stderr) + + daemonMain() + appMain() } |