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.

137 lines
3.3 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
  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 log
  5. import (
  6. "fmt"
  7. "strings"
  8. "testing"
  9. "time"
  10. "github.com/stretchr/testify/assert"
  11. )
  12. func TestConsoleLoggerBadConfig(t *testing.T) {
  13. logger := NewConsoleLogger()
  14. err := logger.Init("{")
  15. assert.Equal(t, "unexpected end of JSON input", err.Error())
  16. logger.Close()
  17. }
  18. func TestConsoleLoggerMinimalConfig(t *testing.T) {
  19. for _, level := range Levels() {
  20. var written []byte
  21. var closed bool
  22. c := CallbackWriteCloser{
  23. callback: func(p []byte, close bool) {
  24. written = p
  25. closed = close
  26. },
  27. }
  28. prefix := ""
  29. flags := LstdFlags
  30. cw := NewConsoleLogger()
  31. realCW := cw.(*ConsoleLogger)
  32. cw.Init(fmt.Sprintf("{\"level\":\"%s\"}", level))
  33. nwc := realCW.out.(*nopWriteCloser)
  34. nwc.w = c
  35. assert.Equal(t, flags, realCW.Flags)
  36. assert.Equal(t, FromString(level), realCW.Level)
  37. assert.Equal(t, FromString(level), cw.GetLevel())
  38. assert.Equal(t, prefix, realCW.Prefix)
  39. assert.Equal(t, "", string(written))
  40. cw.Close()
  41. assert.Equal(t, false, closed)
  42. }
  43. }
  44. func TestConsoleLogger(t *testing.T) {
  45. var written []byte
  46. var closed bool
  47. c := CallbackWriteCloser{
  48. callback: func(p []byte, close bool) {
  49. written = p
  50. closed = close
  51. },
  52. }
  53. prefix := "TestPrefix "
  54. level := INFO
  55. flags := LstdFlags | LUTC | Lfuncname
  56. cw := NewConsoleLogger()
  57. realCW := cw.(*ConsoleLogger)
  58. realCW.Colorize = false
  59. nwc := realCW.out.(*nopWriteCloser)
  60. nwc.w = c
  61. cw.Init(fmt.Sprintf("{\"expression\":\"FILENAME\",\"prefix\":\"%s\",\"level\":\"%s\",\"flags\":%d}", prefix, level.String(), flags))
  62. assert.Equal(t, flags, realCW.Flags)
  63. assert.Equal(t, level, realCW.Level)
  64. assert.Equal(t, level, cw.GetLevel())
  65. location, _ := time.LoadLocation("EST")
  66. date := time.Date(2019, time.January, 13, 22, 3, 30, 15, location)
  67. dateString := date.UTC().Format("2006/01/02 15:04:05")
  68. event := Event{
  69. level: INFO,
  70. msg: "TEST MSG",
  71. caller: "CALLER",
  72. filename: "FULL/FILENAME",
  73. line: 1,
  74. time: date,
  75. }
  76. expected := fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
  77. cw.LogEvent(&event)
  78. assert.Equal(t, expected, string(written))
  79. assert.Equal(t, false, closed)
  80. written = written[:0]
  81. event.level = DEBUG
  82. expected = ""
  83. cw.LogEvent(&event)
  84. assert.Equal(t, expected, string(written))
  85. assert.Equal(t, false, closed)
  86. event.level = TRACE
  87. expected = ""
  88. cw.LogEvent(&event)
  89. assert.Equal(t, expected, string(written))
  90. assert.Equal(t, false, closed)
  91. nonMatchEvent := Event{
  92. level: INFO,
  93. msg: "TEST MSG",
  94. caller: "CALLER",
  95. filename: "FULL/FI_LENAME",
  96. line: 1,
  97. time: date,
  98. }
  99. event.level = INFO
  100. expected = ""
  101. cw.LogEvent(&nonMatchEvent)
  102. assert.Equal(t, expected, string(written))
  103. assert.Equal(t, false, closed)
  104. event.level = WARN
  105. expected = fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
  106. cw.LogEvent(&event)
  107. assert.Equal(t, expected, string(written))
  108. assert.Equal(t, false, closed)
  109. written = written[:0]
  110. cw.Close()
  111. assert.Equal(t, false, closed)
  112. }