Merge branch 'remove/root' into 'master'

Remove gitlab-pages daemon

Closes #114 and #133

See merge request gitlab-org/gitlab-pages!542

1 files changed, 1 insertions, 17 deletions

diff --git a/main.go b/main.go
index f2f1d69b..8d7af93a 100644
--- a/main.go
+++ b/main.go
@@ -5,7 +5,6 @@ import (
 	"io"
 	"math/rand"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -71,7 +70,7 @@ func appMain() {
 	log.WithFields(log.Fields{
 		"version":  VERSION,
 		"revision": REVISION,
-	}).Info("GitLab Pages Daemon")
+	}).Info("GitLab Pages")
 	log.Info("URL: https://gitlab.com/gitlab-org/gitlab-pages")
 
 	if err := os.Chdir(config.General.RootDir); err != nil {
@@ -85,20 +84,6 @@ func appMain() {
 		defer closeAll(cs)
 	}
 
-	if config.Daemon.UID != 0 || config.Daemon.GID != 0 {
-		if err := daemonize(config); err != nil {
-			if strings.Contains(err.Error(), "signal:") {
-				log.WithField("signal", err.Error()).Info("daemon received signal")
-				return
-			}
-
-			errortracking.Capture(err)
-			fatal(err, "could not create pages daemon")
-		}
-
-		return
-	}
-
 	runApp(config)
 }
 
@@ -205,6 +190,5 @@ func main() {
 
 	metrics.MustRegister()
 
-	daemonMain()
 	appMain()
 }