From 931da04dc2c7bdc078ded191b4d44d1e1f0d161b Mon Sep 17 00:00:00 2001 From: ᴜɴᴋɴᴡᴏɴ Date: Mon, 2 Mar 2020 22:25:28 +0800 Subject: cmd/serv: improve hookMode handling (#5960) - Allow remove primary logger at better location - Use more appropriate log.Error to replace log.Fatal --- internal/cmd/serv.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'internal/cmd') diff --git a/internal/cmd/serv.go b/internal/cmd/serv.go index 3478b720..64e0f1d0 100644 --- a/internal/cmd/serv.go +++ b/internal/cmd/serv.go @@ -35,14 +35,17 @@ var Serv = cli.Command{ }, } -func fail(userMessage, logMessage string, args ...interface{}) { +// fail prints user message to the Git client (i.e. os.Stderr) and +// logs error message on the server side. When not in "prod" mode, +// error message is also printed to the client for easier debugging. +func fail(userMessage, errMessage string, args ...interface{}) { fmt.Fprintln(os.Stderr, "Gogs:", userMessage) - if len(logMessage) > 0 { + if len(errMessage) > 0 { if !conf.IsProdMode() { - fmt.Fprintf(os.Stderr, logMessage+"\n", args...) + fmt.Fprintf(os.Stderr, errMessage+"\n", args...) } - log.Fatal(logMessage, args...) + log.Error(errMessage, args...) } os.Exit(1) -- cgit v1.2.3