* Add debug option to serv to help debug problems * fixup! Add debug option to serv to help debug problemsmaster
@@ -65,7 +65,7 @@ Gitea or set your environment appropriately.`, "") | |||||
} | } | ||||
} | } | ||||
setup("hooks/pre-receive.log") | |||||
setup("hooks/pre-receive.log", false) | |||||
// the environment setted on serv command | // the environment setted on serv command | ||||
isWiki := (os.Getenv(models.EnvRepoIsWiki) == "true") | isWiki := (os.Getenv(models.EnvRepoIsWiki) == "true") | ||||
@@ -131,7 +131,7 @@ Gitea or set your environment appropriately.`, "") | |||||
} | } | ||||
} | } | ||||
setup("hooks/update.log") | |||||
setup("hooks/update.log", false) | |||||
return nil | return nil | ||||
} | } | ||||
@@ -147,7 +147,7 @@ Gitea or set your environment appropriately.`, "") | |||||
} | } | ||||
} | } | ||||
setup("hooks/post-receive.log") | |||||
setup("hooks/post-receive.log", false) | |||||
// the environment setted on serv command | // the environment setted on serv command | ||||
repoUser := os.Getenv(models.EnvRepoUsername) | repoUser := os.Getenv(models.EnvRepoUsername) | ||||
@@ -62,7 +62,7 @@ func runKeys(c *cli.Context) error { | |||||
return errors.New("No key type and content provided") | return errors.New("No key type and content provided") | ||||
} | } | ||||
setup("keys.log") | |||||
setup("keys.log", false) | |||||
authorizedString, err := private.AuthorizedPublicKeyByContent(content) | authorizedString, err := private.AuthorizedPublicKeyByContent(content) | ||||
if err != nil { | if err != nil { | ||||
@@ -41,12 +41,20 @@ var CmdServ = cli.Command{ | |||||
cli.BoolFlag{ | cli.BoolFlag{ | ||||
Name: "enable-pprof", | Name: "enable-pprof", | ||||
}, | }, | ||||
cli.BoolFlag{ | |||||
Name: "debug", | |||||
}, | |||||
}, | }, | ||||
} | } | ||||
func setup(logPath string) { | |||||
_ = log.DelLogger("console") | |||||
func setup(logPath string, debug bool) { | |||||
if !debug { | |||||
_ = log.DelLogger("console") | |||||
} | |||||
setting.NewContext() | setting.NewContext() | ||||
if debug { | |||||
setting.ProdMode = false | |||||
} | |||||
} | } | ||||
func parseCmd(cmd string) (string, string) { | func parseCmd(cmd string) (string, string) { | ||||
@@ -80,7 +88,7 @@ func fail(userMessage, logMessage string, args ...interface{}) { | |||||
func runServ(c *cli.Context) error { | func runServ(c *cli.Context) error { | ||||
// FIXME: This needs to internationalised | // FIXME: This needs to internationalised | ||||
setup("serv.log") | |||||
setup("serv.log", c.Bool("debug")) | |||||
if setting.SSH.Disabled { | if setting.SSH.Disabled { | ||||
println("Gitea: SSH has been disabled") | println("Gitea: SSH has been disabled") | ||||