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.

86 lines
2.4 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. "net/smtp"
  8. "strings"
  9. "testing"
  10. "time"
  11. "github.com/stretchr/testify/assert"
  12. )
  13. func TestSMTPLogger(t *testing.T) {
  14. prefix := "TestPrefix "
  15. level := INFO
  16. flags := LstdFlags | LUTC | Lfuncname
  17. username := "testuser"
  18. password := "testpassword"
  19. host := "testhost"
  20. subject := "testsubject"
  21. sendTos := []string{"testto1", "testto2"}
  22. logger := NewSMTPLogger()
  23. smtpLogger, ok := logger.(*SMTPLogger)
  24. assert.Equal(t, true, ok)
  25. err := logger.Init(fmt.Sprintf("{\"prefix\":\"%s\",\"level\":\"%s\",\"flags\":%d,\"username\":\"%s\",\"password\":\"%s\",\"host\":\"%s\",\"subject\":\"%s\",\"sendTos\":[\"%s\",\"%s\"]}", prefix, level.String(), flags, username, password, host, subject, sendTos[0], sendTos[1]))
  26. assert.NoError(t, err)
  27. assert.Equal(t, flags, smtpLogger.Flags)
  28. assert.Equal(t, level, smtpLogger.Level)
  29. assert.Equal(t, level, logger.GetLevel())
  30. location, _ := time.LoadLocation("EST")
  31. date := time.Date(2019, time.January, 13, 22, 3, 30, 15, location)
  32. dateString := date.UTC().Format("2006/01/02 15:04:05")
  33. event := Event{
  34. level: INFO,
  35. msg: "TEST MSG",
  36. caller: "CALLER",
  37. filename: "FULL/FILENAME",
  38. line: 1,
  39. time: date,
  40. }
  41. 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)
  42. var envToHost string
  43. var envFrom string
  44. var envTo []string
  45. var envMsg []byte
  46. smtpLogger.sendMailFn = func(addr string, a smtp.Auth, from string, to []string, msg []byte) error {
  47. envToHost = addr
  48. envFrom = from
  49. envTo = to
  50. envMsg = msg
  51. return nil
  52. }
  53. err = logger.LogEvent(&event)
  54. assert.NoError(t, err)
  55. assert.Equal(t, host, envToHost)
  56. assert.Equal(t, username, envFrom)
  57. assert.Equal(t, sendTos, envTo)
  58. assert.Contains(t, string(envMsg), expected)
  59. logger.Flush()
  60. event.level = WARN
  61. 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)
  62. err = logger.LogEvent(&event)
  63. assert.NoError(t, err)
  64. assert.Equal(t, host, envToHost)
  65. assert.Equal(t, username, envFrom)
  66. assert.Equal(t, sendTos, envTo)
  67. assert.Contains(t, string(envMsg), expected)
  68. logger.Close()
  69. }