From 7bc3ee49aa317e48331cf6e39e1911ac89b2e325 Mon Sep 17 00:00:00 2001
From: ᴜɴᴋɴᴡᴏɴ <u@gogs.io>
Date: Tue, 29 Sep 2020 22:26:07 +0800
Subject: cmd/serv: use different log files for ORMs in hook mode (#6361)
---
internal/cmd/serv.go | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'internal/cmd/serv.go')
diff --git a/internal/cmd/serv.go b/internal/cmd/serv.go
index 4c9bb4ca..06d78a6d 100644
--- a/internal/cmd/serv.go
+++ b/internal/cmd/serv.go
@@ -38,7 +38,7 @@ var Serv = cli.Command{
// 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)
+ _, _ = fmt.Fprintln(os.Stderr, "Gogs:", userMessage)
if len(errMessage) > 0 {
if !conf.IsProdMode() {
@@ -47,10 +47,11 @@ func fail(userMessage, errMessage string, args ...interface{}) {
log.Error(errMessage, args...)
}
+ log.Stop()
os.Exit(1)
}
-func setup(c *cli.Context, logPath string, connectDB bool) {
+func setup(c *cli.Context, logFile string, connectDB bool) {
conf.HookMode = true
var customConf string
@@ -73,7 +74,7 @@ func setup(c *cli.Context, logPath string, connectDB bool) {
err = log.NewFile(log.FileConfig{
Level: level,
- Filename: filepath.Join(conf.Log.RootPath, logPath),
+ Filename: filepath.Join(conf.Log.RootPath, "hooks", logFile),
FileRotationConfig: log.FileRotationConfig{
Rotate: true,
Daily: true,
--
cgit v1.2.3