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.

55 lines
1.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. "encoding/json"
  7. "fmt"
  8. "testing"
  9. "github.com/stretchr/testify/assert"
  10. )
  11. type testLevel struct {
  12. Level Level `json:"level"`
  13. }
  14. func TestLevelMarshalUnmarshalJSON(t *testing.T) {
  15. levelBytes, err := json.Marshal(testLevel{
  16. Level: INFO,
  17. })
  18. assert.NoError(t, err)
  19. assert.Equal(t, string(makeTestLevelBytes(INFO.String())), string(levelBytes))
  20. var testLevel testLevel
  21. err = json.Unmarshal(levelBytes, &testLevel)
  22. assert.NoError(t, err)
  23. assert.Equal(t, INFO, testLevel.Level)
  24. err = json.Unmarshal(makeTestLevelBytes(`FOFOO`), &testLevel)
  25. assert.NoError(t, err)
  26. assert.Equal(t, INFO, testLevel.Level)
  27. err = json.Unmarshal([]byte(fmt.Sprintf(`{"level":%d}`, 2)), &testLevel)
  28. assert.NoError(t, err)
  29. assert.Equal(t, INFO, testLevel.Level)
  30. err = json.Unmarshal([]byte(fmt.Sprintf(`{"level":%d}`, 10012)), &testLevel)
  31. assert.NoError(t, err)
  32. assert.Equal(t, INFO, testLevel.Level)
  33. err = json.Unmarshal([]byte(`{"level":{}}`), &testLevel)
  34. assert.NoError(t, err)
  35. assert.Equal(t, INFO, testLevel.Level)
  36. assert.Equal(t, INFO.String(), Level(1001).String())
  37. err = json.Unmarshal([]byte(`{"level":{}`), &testLevel.Level)
  38. assert.Error(t, err)
  39. }
  40. func makeTestLevelBytes(level string) []byte {
  41. return []byte(fmt.Sprintf(`{"level":"%s"}`, level))
  42. }