diff options
-rw-r--r-- | app.go | 4 | ||||
-rw-r--r-- | daemon.go | 2 | ||||
-rw-r--r-- | helpers.go | 8 | ||||
-rw-r--r-- | main.go | 6 |
4 files changed, 10 insertions, 10 deletions
@@ -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) } @@ -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) @@ -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") } @@ -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 |