You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

84 lines
2.2 KiB

Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
5 years ago
Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
5 years ago
  1. // Copyright 2019 The Gitea Authors. All rights reserved.
  2. // Use of this source code is governed by a MIT-style
  3. // license that can be found in the LICENSE file.
  4. package setting
  5. import (
  6. "time"
  7. "code.gitea.io/gitea/modules/git"
  8. "code.gitea.io/gitea/modules/log"
  9. version "github.com/mcuadros/go-version"
  10. )
  11. var (
  12. // Git settings
  13. Git = struct {
  14. DisableDiffHighlight bool
  15. MaxGitDiffLines int
  16. MaxGitDiffLineCharacters int
  17. MaxGitDiffFiles int
  18. GCArgs []string `ini:"GC_ARGS" delim:" "`
  19. EnableAutoGitWireProtocol bool
  20. Timeout struct {
  21. Default int
  22. Migrate int
  23. Mirror int
  24. Clone int
  25. Pull int
  26. GC int `ini:"GC"`
  27. } `ini:"git.timeout"`
  28. }{
  29. DisableDiffHighlight: false,
  30. MaxGitDiffLines: 1000,
  31. MaxGitDiffLineCharacters: 5000,
  32. MaxGitDiffFiles: 100,
  33. GCArgs: []string{},
  34. EnableAutoGitWireProtocol: true,
  35. Timeout: struct {
  36. Default int
  37. Migrate int
  38. Mirror int
  39. Clone int
  40. Pull int
  41. GC int `ini:"GC"`
  42. }{
  43. Default: int(git.DefaultCommandExecutionTimeout / time.Second),
  44. Migrate: 600,
  45. Mirror: 300,
  46. Clone: 300,
  47. Pull: 300,
  48. GC: 60,
  49. },
  50. }
  51. )
  52. func newGit() {
  53. if err := Cfg.Section("git").MapTo(&Git); err != nil {
  54. log.Fatal("Failed to map Git settings: %v", err)
  55. }
  56. git.DefaultCommandExecutionTimeout = time.Duration(Git.Timeout.Default) * time.Second
  57. binVersion, err := git.BinVersion()
  58. if err != nil {
  59. log.Fatal("Error retrieving git version: %v", err)
  60. }
  61. if version.Compare(binVersion, "2.9", ">=") {
  62. // Explicitly disable credential helper, otherwise Git credentials might leak
  63. git.GlobalCommandArgs = append(git.GlobalCommandArgs, "-c", "credential.helper=")
  64. }
  65. var format = "Git Version: %s"
  66. var args = []interface{}{binVersion}
  67. // Since git wire protocol has been released from git v2.18
  68. if Git.EnableAutoGitWireProtocol && version.Compare(binVersion, "2.18", ">=") {
  69. git.GlobalCommandArgs = append(git.GlobalCommandArgs, "-c", "protocol.version=2")
  70. format += ", Wire Protocol %s Enabled"
  71. args = append(args, "Version 2") // for focus color
  72. }
  73. log.Info(format, args...)
  74. }