From a53367c30c69adafe1f32da247498168b8808645 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 4 Dec 2019 14:03:14 +0100
Subject: Improve error reporting in the main package

---
 app.go     | 4 ++--
 daemon.go  | 2 +-
 helpers.go | 8 ++++----
 main.go    | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app.go b/app.go
index 90b6320d..25a87785 100644
--- a/app.go
+++ b/app.go
@@ -456,6 +456,6 @@ func runApp(config appConfig) {
 }
 
 // fatal will log a fatal error and exit.
-func fatal(err error) {
-	log.WithError(err).Fatal()
+func fatal(err error, message string) {
+	log.WithError(err).Fatal(message)
 }
diff --git a/daemon.go b/daemon.go
index cc9d3217..9142642c 100644
--- a/daemon.go
+++ b/daemon.go
@@ -34,7 +34,7 @@ func daemonMain() {
 	// read the configuration from the pipe "ExtraFiles"
 	var config appConfig
 	if err := json.NewDecoder(os.NewFile(3, "options")).Decode(&config); err != nil {
-		fatal(err)
+		fatal(err, "could not decode app config")
 	}
 	runApp(config)
 	os.Exit(0)
diff --git a/helpers.go b/helpers.go
index b287dc36..d71f2b2c 100644
--- a/helpers.go
+++ b/helpers.go
@@ -11,7 +11,7 @@ import (
 func readFile(file string) (result []byte) {
 	result, err := ioutil.ReadFile(file)
 	if err != nil {
-		fatal(err)
+		fatal(err, "could not read file")
 	}
 	return
 }
@@ -21,7 +21,7 @@ func readFile(file string) (result []byte) {
 func createSocket(addr string) (net.Listener, *os.File) {
 	l, err := net.Listen("tcp", addr)
 	if err != nil {
-		fatal(err)
+		fatal(err, "could not create socket")
 	}
 
 	return l, fileForListener(l)
@@ -34,7 +34,7 @@ func fileForListener(l net.Listener) *os.File {
 
 	f, err := l.(filer).File()
 	if err != nil {
-		fatal(err)
+		fatal(err, "could not find file for listener")
 	}
 
 	return f
@@ -42,5 +42,5 @@ func fileForListener(l net.Listener) *os.File {
 
 func capturingFatal(err error, fields ...errortracking.CaptureOption) {
 	errortracking.Capture(err, fields...)
-	fatal(err)
+	fatal(err, "capturing fatal")
 }
diff --git a/main.go b/main.go
index dc2d7873..4583435b 100644
--- a/main.go
+++ b/main.go
@@ -256,7 +256,7 @@ func appMain() {
 	flag.String(flag.DefaultConfigFlagname, "", "path to config file")
 	flag.Parse()
 	if err := tlsconfig.ValidateTLSVersions(*tlsMinVersion, *tlsMaxVersion); err != nil {
-		fatal(err)
+		fatal(err, "invalid TLS version")
 	}
 
 	printVersion(*showVersion, VERSION)
@@ -273,7 +273,7 @@ func appMain() {
 	log.Printf("URL: https://gitlab.com/gitlab-org/gitlab-pages")
 
 	if err := os.Chdir(*pagesRoot); err != nil {
-		fatal(err)
+		fatal(err, "could not change directory into pagesRoot")
 	}
 
 	config := loadConfig()
@@ -288,7 +288,7 @@ func appMain() {
 	if *daemonUID != 0 || *daemonGID != 0 {
 		if err := daemonize(config, *daemonUID, *daemonGID, *daemonInplaceChroot); err != nil {
 			errortracking.Capture(err)
-			fatal(err)
+			fatal(err, "could not create pages daemon")
 		}
 
 		return
-- 
cgit v1.2.3