diff options
| -rw-r--r-- | internal/cmd/serv.go | 11 | ||||
| -rw-r--r-- | internal/conf/log.go | 15 |
2 files changed, 17 insertions, 9 deletions
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) diff --git a/internal/conf/log.go b/internal/conf/log.go index 58e17f87..e6865a41 100644 --- a/internal/conf/log.go +++ b/internal/conf/log.go @@ -126,17 +126,15 @@ func initLogConf(cfg *ini.File, hookMode bool) (_ *logConf, hasConsole bool, _ e } // InitLogging initializes the logging service of the application. When the -// argument "hookMode" is true, it only initializes the root path for log files -// without creating any logger. +// "hookMode" is true, it only initializes the root path for log files without +// creating any logger. It will also not remove the primary logger in "hookMode" +// and is up to the caller to decide when to remove it. func InitLogging(hookMode bool) { logConf, hasConsole, err := initLogConf(File, hookMode) if err != nil { log.Fatal("Failed to init logging configuration: %v", err) } defer func() { - if !hasConsole { - log.Remove(log.DefaultConsoleName) - } Log = logConf }() @@ -177,4 +175,11 @@ func InitLogging(hookMode bool) { } log.Trace("Log mode: %s (%s)", strings.Title(mode), strings.Title(strings.ToLower(level.String()))) } + + // ⚠️ WARNING: It is only safe to remove the primary logger until + // there are other loggers that are initialized. Otherwise, the + // application will print errors to nowhere. + if !hasConsole { + log.Remove(log.DefaultConsoleName) + } } |